Messaging Menu

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

  1. lp-1103087
  2. Merge into trunk.13.04
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 336
Merged at revision: 335
Proposed branch: lp:~charlesk/indicator-messages/lp-1103087
Merge into: lp:indicator-messages/13.04
Diff against target: 107 lines (+4/-17)
6 files modified
configure.ac (+1/-1)
debian/control (+1/-0)
doc/reference/Makefile.am (+0/-1)
src/messages-service.c (+2/-5)
test/indicator-messages-service-activate.c (+0/-2)
test/test-gactionmuxer.cpp (+0/-8)
To merge this branch: bzr merge lp:~charlesk/indicator-messages/lp-1103087
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+144385@code.launchpad.net

Description of the change

remove g_type_init() calls, bump glib requirement to 2.35.4

To post a comment you must log in.
lp:~charlesk/indicator-messages/lp-1103087 updated
336. By Charles Kerr

add glib requirement to debian/control. bump glib requirement in configure.ac

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=raring,flavor=armhf/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=raring,flavor=i386/35/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/35//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=raring,flavor=armhf/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./build=pbuilder,distribution=raring,flavor=i386/36/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/36//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-11-08 15:39:07 +0000
3+++ configure.ac 2013-01-22 20:32:18 +0000
4@@ -41,7 +41,7 @@
5 GTK_REQUIRED_VERSION=3.5.18
6 GIO_UNIX_REQUIRED_VERSION=2.33.10
7 INDICATOR_REQUIRED_VERSION=0.3.19
8-GLIB_REQUIRED_VERSION=2.33.10
9+GLIB_REQUIRED_VERSION=2.35.4
10 INTROSPECTION_REQUIRED_VERSION=1.32.0
11
12 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
13
14=== modified file 'debian/control'
15--- debian/control 2012-11-14 21:42:01 +0000
16+++ debian/control 2013-01-22 20:32:18 +0000
17@@ -7,6 +7,7 @@
18 Build-Depends: debhelper (>= 9),
19 dh-autoreconf,
20 dh-translations,
21+ libglib2.0-dev (>= 2.35.4),
22 libgtk-3-dev (>= 3.5.12),
23 libdbus-glib-1-dev,
24 intltool,
25
26=== modified file 'doc/reference/Makefile.am'
27--- doc/reference/Makefile.am 2012-08-29 11:27:54 +0000
28+++ doc/reference/Makefile.am 2013-01-22 20:32:18 +0000
29@@ -4,7 +4,6 @@
30
31 DOC_SOURCE_DIR = $(top_srcdir)/libmessaging-menu
32
33-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
34 MKDB_OPTIONS=--xml-mode --output-format=xml
35
36 # Used for dependencies. The docs will be rebuilt if any of these change.
37
38=== modified file 'src/messages-service.c'
39--- src/messages-service.c 2012-10-02 21:19:53 +0000
40+++ src/messages-service.c 2013-01-22 20:32:18 +0000
41@@ -619,11 +619,8 @@
42 int
43 main (int argc, char ** argv)
44 {
45- GMainLoop * mainloop = NULL;
46- IndicatorService * service = NULL;
47-
48- /* Glib init */
49- g_type_init();
50+ GMainLoop * mainloop;
51+ IndicatorService * service;
52
53 mainloop = g_main_loop_new (NULL, FALSE);
54
55
56=== modified file 'test/indicator-messages-service-activate.c'
57--- test/indicator-messages-service-activate.c 2009-05-28 15:29:41 +0000
58+++ test/indicator-messages-service-activate.c 2013-01-22 20:32:18 +0000
59@@ -28,8 +28,6 @@
60 int
61 main (int argc, char ** argv)
62 {
63- g_type_init();
64-
65 guint returnval = 0;
66 GError * error = NULL;
67
68
69=== modified file 'test/test-gactionmuxer.cpp'
70--- test/test-gactionmuxer.cpp 2012-06-04 21:47:13 +0000
71+++ test/test-gactionmuxer.cpp 2013-01-22 20:32:18 +0000
72@@ -25,8 +25,6 @@
73 TEST(GActionMuxerTest, Sanity) {
74 GActionMuxer *muxer;
75
76- g_type_init ();
77-
78 g_action_muxer_insert (NULL, NULL, NULL);
79 g_action_muxer_remove (NULL, NULL);
80
81@@ -46,8 +44,6 @@
82 GActionMuxer *muxer;
83 gchar **actions;
84
85- g_type_init ();
86-
87 muxer = g_action_muxer_new ();
88
89 actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
90@@ -67,8 +63,6 @@
91 GActionMuxer *muxer;
92 gchar **actions;
93
94- g_type_init ();
95-
96 group1 = g_simple_action_group_new ();
97 g_simple_action_group_add_entries (group1,
98 entries1,
99@@ -160,8 +154,6 @@
100 GVariant *state_hint[2];
101 GVariant *state[2];
102
103- g_type_init ();
104-
105 group = g_simple_action_group_new ();
106 action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
107 g_simple_action_group_insert (group, G_ACTION (action));

Subscribers

People subscribed via source and target branches