From ebba9b86ef73743af028a82d53afa0a556017fe9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 13 Nov 2012 13:40:12 +0100 Subject: Remove gtupleaction, it isn't used anymore --- doc/reference/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 023f1e7..3ea08f2 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -12,8 +12,7 @@ HFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.h CFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.c IGNORE_HFILES= \ - indicator-messages-service.h \ - gtupleaction.h + indicator-messages-service.h INCLUDES=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS) GTKDOC_LIBS=$(top_builddir)/libmessaging-menu/libmessaging-menu.la -- cgit v1.2.3 From 5e3abf725e0628673c1bb16869edc67dfa7e2729 Mon Sep 17 00:00:00 2001 From: Sergio Schvezov Date: Fri, 22 Mar 2013 16:54:38 -0300 Subject: Adding glib version guard to g_type_init --- doc/reference/Makefile.am | 1 - src/messages-service.c | 2 ++ test/indicator-messages-service-activate.c | 2 ++ test/test-gactionmuxer.cpp | 8 ++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 3ea08f2..3993b41 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 c2ca1a0..5f320fc 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -130,7 +130,9 @@ main (int argc, char ** argv) GBusNameOwnerFlags flags; /* Glib init */ +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init(); +#endif 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..f5a26b0 100644 --- a/test/indicator-messages-service-activate.c +++ b/test/indicator-messages-service-activate.c @@ -28,7 +28,9 @@ with this program. If not, see . int main (int argc, char ** argv) { +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init(); +#endif guint returnval = 0; GError * error = NULL; diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp index de51211..efd6e4f 100644 --- a/test/test-gactionmuxer.cpp +++ b/test/test-gactionmuxer.cpp @@ -43,7 +43,9 @@ strv_contains (gchar **str_array, TEST(GActionMuxerTest, Sanity) { GActionMuxer *muxer; +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init (); +#endif g_action_muxer_insert (NULL, NULL, NULL); g_action_muxer_remove (NULL, NULL); @@ -64,7 +66,9 @@ TEST(GActionMuxerTest, Empty) { GActionMuxer *muxer; gchar **actions; +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init (); +#endif muxer = g_action_muxer_new (); @@ -85,7 +89,9 @@ TEST(GActionMuxerTest, AddAndRemove) { GActionMuxer *muxer; gchar **actions; +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init (); +#endif group1 = g_simple_action_group_new (); g_simple_action_group_add_entries (group1, @@ -178,7 +184,9 @@ TEST(GActionMuxerTest, ActionAttributes) { GVariant *state_hint[2]; GVariant *state[2]; +#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34 g_type_init (); +#endif group = g_simple_action_group_new (); action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING); -- cgit v1.2.3 From 55dc5c4f511325e1b8bb5cbed0c9d6be8812ca30 Mon Sep 17 00:00:00 2001 From: Sergio Schvezov Date: Fri, 22 Mar 2013 17:41:26 -0300 Subject: Adding guards for g_type_init --- debian/changelog | 6 ++++++ doc/reference/messaging-menu-docs.xml.in | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index a255341..9322c8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-messages (12.10.6phablet1) quantal; urgency=low + + * Adding guards for g_type_init + + -- Sergio Schvezov Fri, 22 Mar 2013 17:23:45 -0300 + indicator-messages (12.10.6-0ubuntu1phablet9) quantal; urgency=low * add "remove-all" signal to imapplicationlist (temporarily) diff --git a/doc/reference/messaging-menu-docs.xml.in b/doc/reference/messaging-menu-docs.xml.in index 742d37b..4c1cec1 100644 --- a/doc/reference/messaging-menu-docs.xml.in +++ b/doc/reference/messaging-menu-docs.xml.in @@ -18,7 +18,8 @@ API Reference - + + -- cgit v1.2.3