Application Menu Indicator

Merge lp:~charlesk/indicator-appmenu/lp-1103087 into lp:indicator-appmenu/13.04

  1. lp-1103087
  2. Merge into trunk.13.04
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 229
Merged at revision: 229
Proposed branch: lp:~charlesk/indicator-appmenu/lp-1103087
Merge into: lp:indicator-appmenu/13.04
Diff against target: 199 lines (+7/-31)
14 files modified
configure.ac (+5/-2)
debian/control (+1/-0)
src/hud-cli.c (+0/-3)
src/hud-service.c (+0/-2)
src/hud-verify-app-info.c (+0/-2)
tests/hud-performance.c (+1/-2)
tests/test-bad-app-info.c (+0/-2)
tests/test-distance.c (+0/-3)
tests/test-load-app-info.c (+0/-2)
tests/test-result-highlighting.c (+0/-3)
tests/test-usage-db-ancient.c (+0/-1)
tests/test-usage-db-old.c (+0/-3)
tests/test-usage-db-simple.c (+0/-3)
tests/test-usage-db-testapp.c (+0/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-appmenu/lp-1103087
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+144392@code.launchpad.net

Description of the change

add an explicit glib minimum version; remove deprecated calls to g_type_init()

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:229
http://s-jenkins:8080/job/indicator-appmenu-ci/12/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/12/console
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/12//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-12-27 15:50:33 +0000
3+++ configure.ac 2013-01-22 20:43:22 +0000
4@@ -57,15 +57,18 @@
5 # Dependencies
6 ###########################
7
8+
9+GLIB_REQUIRED_VERSION=2.35.4
10+GIO_REQUIRED_VERSION=2.26
11 GTK_REQUIRED_VERSION=3.0
12-GIO_REQUIRED_VERSION=2.26
13 INDICATOR_REQUIRED_VERSION=0.3.90
14 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
15 BAMF_REQUIRED_VERSION=0.2.53
16
17 PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
18-PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK_REQUIRED_VERSION
19+PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
20 gio-2.0 >= $GIO_REQUIRED_VERSION
21+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
22 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
23 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
24 libbamf3 >= $BAMF_REQUIRED_VERSION)
25
26=== modified file 'debian/control'
27--- debian/control 2012-12-03 17:40:45 +0000
28+++ debian/control 2013-01-22 20:43:22 +0000
29@@ -4,6 +4,7 @@
30 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
31 Build-Depends: debhelper (>= 9),
32 dh-autoreconf,
33+ libglib2.0-dev (>= 2.35.4),
34 libgtk-3-dev,
35 gnome-doc-utils,
36 gtk-doc-tools,
37
38=== modified file 'src/hud-cli.c'
39--- src/hud-cli.c 2012-12-03 17:40:45 +0000
40+++ src/hud-cli.c 2013-01-22 20:43:22 +0000
41@@ -45,9 +45,6 @@
42 int
43 main (int argc, char *argv[])
44 {
45-
46- g_type_init();
47-
48 int single_char;
49 int pos = 0;
50
51
52=== modified file 'src/hud-service.c'
53--- src/hud-service.c 2012-12-03 17:40:45 +0000
54+++ src/hud-service.c 2013-01-22 20:43:22 +0000
55@@ -275,8 +275,6 @@
56 HudWindowSource *window_source;
57 HudSourceList *source_list;
58
59- g_type_init ();
60-
61 setlocale (LC_ALL, "");
62 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
63 textdomain (GETTEXT_PACKAGE);
64
65=== modified file 'src/hud-verify-app-info.c'
66--- src/hud-verify-app-info.c 2012-12-03 17:40:45 +0000
67+++ src/hud-verify-app-info.c 2013-01-22 20:43:22 +0000
68@@ -53,8 +53,6 @@
69 return 1;
70 }
71
72- g_type_init();
73-
74 gchar * filename = NULL;
75 gint tmpfile = g_file_open_tmp("hud-verify-app-info-temp-db-XXXXXX", &filename, NULL);
76
77
78=== modified file 'tests/hud-performance.c'
79--- tests/hud-performance.c 2012-12-03 17:40:45 +0000
80+++ tests/hud-performance.c 2013-01-22 20:43:22 +0000
81@@ -269,9 +269,8 @@
82 int
83 main (int argc, char **argv)
84 {
85- g_type_init ();
86-
87 g_test_init (&argc, &argv, NULL);
88+
89 if (g_test_perf ())
90 g_test_add_func ("/hud/query-performance", test_query_performance);
91
92
93=== modified file 'tests/test-bad-app-info.c'
94--- tests/test-bad-app-info.c 2012-12-03 17:40:45 +0000
95+++ tests/test-bad-app-info.c 2013-01-22 20:43:22 +0000
96@@ -53,8 +53,6 @@
97 return 1;
98 }
99
100- g_type_init();
101-
102 gchar * filename = NULL;
103 gint tmpfile = g_file_open_tmp("hud-test-bad-app-info-temp-db-XXXXXX", &filename, NULL);
104
105
106=== modified file 'tests/test-distance.c'
107--- tests/test-distance.c 2012-12-03 17:40:45 +0000
108+++ tests/test-distance.c 2013-01-22 20:43:22 +0000
109@@ -258,9 +258,6 @@
110 gint
111 main (gint argc, gchar * argv[])
112 {
113- //gtk_init(&argc, &argv);
114- g_type_init();
115-
116 g_test_init(&argc, &argv, NULL);
117
118 /* Test suites */
119
120=== modified file 'tests/test-load-app-info.c'
121--- tests/test-load-app-info.c 2012-12-03 17:40:45 +0000
122+++ tests/test-load-app-info.c 2013-01-22 20:43:22 +0000
123@@ -53,8 +53,6 @@
124 return 1;
125 }
126
127- g_type_init();
128-
129 gchar * filename = argc[1];
130
131 sqlite3 * db = NULL;
132
133=== modified file 'tests/test-result-highlighting.c'
134--- tests/test-result-highlighting.c 2012-12-03 17:40:45 +0000
135+++ tests/test-result-highlighting.c 2013-01-22 20:43:22 +0000
136@@ -189,9 +189,6 @@
137 gint
138 main (gint argc, gchar * argv[])
139 {
140- //gtk_init(&argc, &argv);
141- g_type_init();
142-
143 g_test_init(&argc, &argv, NULL);
144
145 /* Test suites */
146
147=== modified file 'tests/test-usage-db-ancient.c'
148--- tests/test-usage-db-ancient.c 2012-12-03 17:40:45 +0000
149+++ tests/test-usage-db-ancient.c 2013-01-22 20:43:22 +0000
150@@ -33,7 +33,6 @@
151 gint
152 main (gint argc, gchar * argv[])
153 {
154- g_type_init();
155 UsageTracker * tracker = usage_tracker_new();
156 g_object_unref(tracker);
157 return 0;
158
159=== modified file 'tests/test-usage-db-old.c'
160--- tests/test-usage-db-old.c 2012-12-03 17:40:45 +0000
161+++ tests/test-usage-db-old.c 2013-01-22 20:43:22 +0000
162@@ -71,9 +71,6 @@
163 gint
164 main (gint argc, gchar * argv[])
165 {
166- //gtk_init(&argc, &argv);
167- g_type_init();
168-
169 g_test_init(&argc, &argv, NULL);
170
171 /* Test suites */
172
173=== modified file 'tests/test-usage-db-simple.c'
174--- tests/test-usage-db-simple.c 2012-12-03 17:40:45 +0000
175+++ tests/test-usage-db-simple.c 2013-01-22 20:43:22 +0000
176@@ -97,9 +97,6 @@
177 gint
178 main (gint argc, gchar * argv[])
179 {
180- //gtk_init(&argc, &argv);
181- g_type_init();
182-
183 g_test_init(&argc, &argv, NULL);
184
185 /* Test suites */
186
187=== modified file 'tests/test-usage-db-testapp.c'
188--- tests/test-usage-db-testapp.c 2012-12-03 17:40:45 +0000
189+++ tests/test-usage-db-testapp.c 2013-01-22 20:43:22 +0000
190@@ -71,9 +71,6 @@
191 gint
192 main (gint argc, gchar * argv[])
193 {
194- //gtk_init(&argc, &argv);
195- g_type_init();
196-
197 g_test_init(&argc, &argv, NULL);
198
199 /* Test suites */

Subscribers

People subscribed via source and target branches