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
=== modified file 'configure.ac'
--- configure.ac 2012-12-27 15:50:33 +0000
+++ configure.ac 2013-01-22 20:43:22 +0000
@@ -57,15 +57,18 @@
57# Dependencies57# Dependencies
58###########################58###########################
5959
60
61GLIB_REQUIRED_VERSION=2.35.4
62GIO_REQUIRED_VERSION=2.26
60GTK_REQUIRED_VERSION=3.063GTK_REQUIRED_VERSION=3.0
61GIO_REQUIRED_VERSION=2.26
62INDICATOR_REQUIRED_VERSION=0.3.9064INDICATOR_REQUIRED_VERSION=0.3.90
63DBUSMENUGTK_REQUIRED_VERSION=0.5.9065DBUSMENUGTK_REQUIRED_VERSION=0.5.90
64BAMF_REQUIRED_VERSION=0.2.5366BAMF_REQUIRED_VERSION=0.2.53
6567
66PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)68PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
67PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK_REQUIRED_VERSION69PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
68 gio-2.0 >= $GIO_REQUIRED_VERSION70 gio-2.0 >= $GIO_REQUIRED_VERSION
71 gtk+-3.0 >= $GTK_REQUIRED_VERSION
69 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION72 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
70 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION73 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
71 libbamf3 >= $BAMF_REQUIRED_VERSION)74 libbamf3 >= $BAMF_REQUIRED_VERSION)
7275
=== modified file 'debian/control'
--- debian/control 2012-12-03 17:40:45 +0000
+++ debian/control 2013-01-22 20:43:22 +0000
@@ -4,6 +4,7 @@
4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
5Build-Depends: debhelper (>= 9),5Build-Depends: debhelper (>= 9),
6 dh-autoreconf,6 dh-autoreconf,
7 libglib2.0-dev (>= 2.35.4),
7 libgtk-3-dev,8 libgtk-3-dev,
8 gnome-doc-utils,9 gnome-doc-utils,
9 gtk-doc-tools,10 gtk-doc-tools,
1011
=== modified file 'src/hud-cli.c'
--- src/hud-cli.c 2012-12-03 17:40:45 +0000
+++ src/hud-cli.c 2013-01-22 20:43:22 +0000
@@ -45,9 +45,6 @@
45int45int
46main (int argc, char *argv[])46main (int argc, char *argv[])
47{47{
48
49 g_type_init();
50
51 int single_char;48 int single_char;
52 int pos = 0;49 int pos = 0;
53 50
5451
=== modified file 'src/hud-service.c'
--- src/hud-service.c 2012-12-03 17:40:45 +0000
+++ src/hud-service.c 2013-01-22 20:43:22 +0000
@@ -275,8 +275,6 @@
275 HudWindowSource *window_source;275 HudWindowSource *window_source;
276 HudSourceList *source_list;276 HudSourceList *source_list;
277277
278 g_type_init ();
279
280 setlocale (LC_ALL, "");278 setlocale (LC_ALL, "");
281 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);279 bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
282 textdomain (GETTEXT_PACKAGE);280 textdomain (GETTEXT_PACKAGE);
283281
=== modified file 'src/hud-verify-app-info.c'
--- src/hud-verify-app-info.c 2012-12-03 17:40:45 +0000
+++ src/hud-verify-app-info.c 2013-01-22 20:43:22 +0000
@@ -53,8 +53,6 @@
53 return 1;53 return 1;
54 }54 }
5555
56 g_type_init();
57
58 gchar * filename = NULL;56 gchar * filename = NULL;
59 gint tmpfile = g_file_open_tmp("hud-verify-app-info-temp-db-XXXXXX", &filename, NULL);57 gint tmpfile = g_file_open_tmp("hud-verify-app-info-temp-db-XXXXXX", &filename, NULL);
6058
6159
=== modified file 'tests/hud-performance.c'
--- tests/hud-performance.c 2012-12-03 17:40:45 +0000
+++ tests/hud-performance.c 2013-01-22 20:43:22 +0000
@@ -269,9 +269,8 @@
269int269int
270main (int argc, char **argv)270main (int argc, char **argv)
271{271{
272 g_type_init ();
273
274 g_test_init (&argc, &argv, NULL);272 g_test_init (&argc, &argv, NULL);
273
275 if (g_test_perf ())274 if (g_test_perf ())
276 g_test_add_func ("/hud/query-performance", test_query_performance);275 g_test_add_func ("/hud/query-performance", test_query_performance);
277276
278277
=== modified file 'tests/test-bad-app-info.c'
--- tests/test-bad-app-info.c 2012-12-03 17:40:45 +0000
+++ tests/test-bad-app-info.c 2013-01-22 20:43:22 +0000
@@ -53,8 +53,6 @@
53 return 1;53 return 1;
54 }54 }
5555
56 g_type_init();
57
58 gchar * filename = NULL;56 gchar * filename = NULL;
59 gint tmpfile = g_file_open_tmp("hud-test-bad-app-info-temp-db-XXXXXX", &filename, NULL);57 gint tmpfile = g_file_open_tmp("hud-test-bad-app-info-temp-db-XXXXXX", &filename, NULL);
6058
6159
=== modified file 'tests/test-distance.c'
--- tests/test-distance.c 2012-12-03 17:40:45 +0000
+++ tests/test-distance.c 2013-01-22 20:43:22 +0000
@@ -258,9 +258,6 @@
258gint258gint
259main (gint argc, gchar * argv[])259main (gint argc, gchar * argv[])
260{260{
261 //gtk_init(&argc, &argv);
262 g_type_init();
263
264 g_test_init(&argc, &argv, NULL);261 g_test_init(&argc, &argv, NULL);
265262
266 /* Test suites */263 /* Test suites */
267264
=== modified file 'tests/test-load-app-info.c'
--- tests/test-load-app-info.c 2012-12-03 17:40:45 +0000
+++ tests/test-load-app-info.c 2013-01-22 20:43:22 +0000
@@ -53,8 +53,6 @@
53 return 1;53 return 1;
54 }54 }
5555
56 g_type_init();
57
58 gchar * filename = argc[1];56 gchar * filename = argc[1];
5957
60 sqlite3 * db = NULL;58 sqlite3 * db = NULL;
6159
=== modified file 'tests/test-result-highlighting.c'
--- tests/test-result-highlighting.c 2012-12-03 17:40:45 +0000
+++ tests/test-result-highlighting.c 2013-01-22 20:43:22 +0000
@@ -189,9 +189,6 @@
189gint189gint
190main (gint argc, gchar * argv[])190main (gint argc, gchar * argv[])
191{191{
192 //gtk_init(&argc, &argv);
193 g_type_init();
194
195 g_test_init(&argc, &argv, NULL);192 g_test_init(&argc, &argv, NULL);
196193
197 /* Test suites */194 /* Test suites */
198195
=== modified file 'tests/test-usage-db-ancient.c'
--- tests/test-usage-db-ancient.c 2012-12-03 17:40:45 +0000
+++ tests/test-usage-db-ancient.c 2013-01-22 20:43:22 +0000
@@ -33,7 +33,6 @@
33gint33gint
34main (gint argc, gchar * argv[])34main (gint argc, gchar * argv[])
35{35{
36 g_type_init();
37 UsageTracker * tracker = usage_tracker_new();36 UsageTracker * tracker = usage_tracker_new();
38 g_object_unref(tracker);37 g_object_unref(tracker);
39 return 0;38 return 0;
4039
=== modified file 'tests/test-usage-db-old.c'
--- tests/test-usage-db-old.c 2012-12-03 17:40:45 +0000
+++ tests/test-usage-db-old.c 2013-01-22 20:43:22 +0000
@@ -71,9 +71,6 @@
71gint71gint
72main (gint argc, gchar * argv[])72main (gint argc, gchar * argv[])
73{73{
74 //gtk_init(&argc, &argv);
75 g_type_init();
76
77 g_test_init(&argc, &argv, NULL);74 g_test_init(&argc, &argv, NULL);
7875
79 /* Test suites */76 /* Test suites */
8077
=== modified file 'tests/test-usage-db-simple.c'
--- tests/test-usage-db-simple.c 2012-12-03 17:40:45 +0000
+++ tests/test-usage-db-simple.c 2013-01-22 20:43:22 +0000
@@ -97,9 +97,6 @@
97gint97gint
98main (gint argc, gchar * argv[])98main (gint argc, gchar * argv[])
99{99{
100 //gtk_init(&argc, &argv);
101 g_type_init();
102
103 g_test_init(&argc, &argv, NULL);100 g_test_init(&argc, &argv, NULL);
104101
105 /* Test suites */102 /* Test suites */
106103
=== modified file 'tests/test-usage-db-testapp.c'
--- tests/test-usage-db-testapp.c 2012-12-03 17:40:45 +0000
+++ tests/test-usage-db-testapp.c 2013-01-22 20:43:22 +0000
@@ -71,9 +71,6 @@
71gint71gint
72main (gint argc, gchar * argv[])72main (gint argc, gchar * argv[])
73{73{
74 //gtk_init(&argc, &argv);
75 g_type_init();
76
77 g_test_init(&argc, &argv, NULL);74 g_test_init(&argc, &argv, NULL);
7875
79 /* Test suites */76 /* Test suites */

Subscribers

People subscribed via source and target branches