[emerillon/gtk3] Use cogl, clutter and gtk_clutter option groups



commit 1d724ce585b8086a812a77845219383764734b2f
Author: Laurent Bigonville <bigon bigon be>
Date:   Wed Aug 10 21:40:55 2011 +0200

    Use cogl, clutter and gtk_clutter option groups
    
    Do not call gtk_clutter_init() or gtk_init() anymore, these are called
    by the option_group functions

 emerillon/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/emerillon/main.c b/emerillon/main.c
index f099333..fb44813 100644
--- a/emerillon/main.c
+++ b/emerillon/main.c
@@ -93,6 +93,9 @@ parse_options (int *argc,
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+  g_option_context_add_group (context, cogl_get_option_group ());
+  g_option_context_add_group (context, clutter_get_option_group_without_init ());
+  g_option_context_add_group (context, gtk_clutter_get_option_group ());
 
   position_group = g_option_group_new ("position", _("Specifies the default position"),
                                        _("Show position options"), NULL, NULL);
@@ -144,9 +147,6 @@ main (int argc,
 
   parse_options(&argc, &argv);
 
-  gtk_init (&argc, &argv);
-  gtk_clutter_init (&argc, &argv);
-
   g_set_application_name (_("Emerillon Map Viewer"));
 
   window = emerillon_window_dup_default ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]