diff options
| -rw-r--r-- | doc/reference/Makefile.am | 1 | ||||
| -rw-r--r-- | src/messages-service.c | 7 | ||||
| -rw-r--r-- | test/indicator-messages-service-activate.c | 2 | ||||
| -rw-r--r-- | test/test-gactionmuxer.cpp | 8 |
4 files changed, 2 insertions, 16 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 023f1e7..814a939 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -4,7 +4,6 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml DOC_SOURCE_DIR = $(top_srcdir)/libmessaging-menu -SCANGOBJ_OPTIONS=--type-init-func="g_type_init()" MKDB_OPTIONS=--xml-mode --output-format=xml # Used for dependencies. The docs will be rebuilt if any of these change. diff --git a/src/messages-service.c b/src/messages-service.c index b36a0a2..48c830e 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -619,11 +619,8 @@ got_bus (GObject *object, int main (int argc, char ** argv) { - GMainLoop * mainloop = NULL; - IndicatorService * service = NULL; - - /* Glib init */ - g_type_init(); + GMainLoop * mainloop; + IndicatorService * service; mainloop = g_main_loop_new (NULL, FALSE); diff --git a/test/indicator-messages-service-activate.c b/test/indicator-messages-service-activate.c index 98c6522..b0ec9b7 100644 --- a/test/indicator-messages-service-activate.c +++ b/test/indicator-messages-service-activate.c @@ -28,8 +28,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. int main (int argc, char ** argv) { - g_type_init(); - guint returnval = 0; GError * error = NULL; diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp index 6304853..b80f86d 100644 --- a/test/test-gactionmuxer.cpp +++ b/test/test-gactionmuxer.cpp @@ -25,8 +25,6 @@ strv_contains (gchar **str_array, TEST(GActionMuxerTest, Sanity) { GActionMuxer *muxer; - g_type_init (); - g_action_muxer_insert (NULL, NULL, NULL); g_action_muxer_remove (NULL, NULL); @@ -46,8 +44,6 @@ TEST(GActionMuxerTest, Empty) { GActionMuxer *muxer; gchar **actions; - g_type_init (); - muxer = g_action_muxer_new (); actions = g_action_group_list_actions (G_ACTION_GROUP (muxer)); @@ -67,8 +63,6 @@ TEST(GActionMuxerTest, AddAndRemove) { GActionMuxer *muxer; gchar **actions; - g_type_init (); - group1 = g_simple_action_group_new (); g_simple_action_group_add_entries (group1, entries1, @@ -160,8 +154,6 @@ TEST(GActionMuxerTest, ActionAttributes) { GVariant *state_hint[2]; GVariant *state[2]; - g_type_init (); - group = g_simple_action_group_new (); action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING); g_simple_action_group_insert (group, G_ACTION (action)); |