monkey-bubble r269 - in trunk: . src/ui

[herzi svn gnome org]

Author: herzi
Date: Wed Feb  6 23:14:48 2008
New Revision: 269
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=269&view=rev

Log:
2008-02-07  Sven Herzberg  <sven imendio com>

	* src/ui/ui-main.c: (ui_main_new), (about), (show_help_content):
	changed signal handler prototypes to match the ones for the upcoming
	GtkAction* API (noone used the GtkMenuItem anyway)


Modified:
   trunk/ChangeLog
   trunk/src/ui/ui-main.c

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Wed Feb  6 23:14:48 2008
@@ -94,16 +94,14 @@
 static void quit_program      (UiMain* uimain);
 
 #ifdef GNOME
-static void about(gpointer    callback_data,
-                  guint       callback_action,
-                  GtkWidget  *widget);
+static void about             (GtkAction* action,
+			       UiMain   * uimain);
 
 static void show_error_dialog (GtkWindow *transient_parent,
                                const char *message_format, ...);
 
-static void show_help_content(gpointer    callback_data,
-                              guint       callback_action,
-                              GtkWidget  *widget);
+static void show_help_content (GtkAction* action,
+			       UiMain   * uimain);
 
 static void show_preferences_dialog(gpointer    callback_data,
                                     guint       callback_action,
@@ -423,10 +421,10 @@
 
         item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"help_contents");
 
-        g_signal_connect_swapped(item, "activate", 
+        g_signal_connect(item, "activate", 
                                  GTK_SIGNAL_FUNC(show_help_content), ui_main);
 
-        g_signal_connect_swapped (
+        g_signal_connect (
                                   glade_xml_get_widget (PRIVATE(ui_main)->glade_xml,"about"),
                                   "activate",
                                   G_CALLBACK (about),
@@ -799,9 +797,10 @@
 #endif
 
 #ifdef GNOME
-static void about (gpointer    callback_data,
-                   guint       callback_action,
-                   GtkWidget  *widget) {
+static void
+about (GtkAction* action,
+       UiMain   * ui_main)
+{
 
         const gchar* authors[] = {
                 "Laurent Belmonte <laurent belmonte aliacom fr>",
@@ -830,17 +829,15 @@
 
         g_object_unref( logo);
 }
-#endif
 
-#ifdef GNOME
-static void show_help_content(gpointer    callback_data,
-                              guint       callback_action,
-                              GtkWidget  *widget) {
-        UiMain * ui_main;
+static void
+show_help_content (GtkAction* action,
+		   UiMain   * ui_main)
+{
         GError *err = NULL;
 
         gnome_help_display ("monkey-bubble", NULL, &err);
-    
+
         if (err) {
                 ui_main = ui_main_get_instance();
                 show_error_dialog (GTK_WINDOW (PRIVATE(ui_main)->window),
@@ -849,9 +846,7 @@
                 g_error_free (err);
         }
 }
-#endif
 
-#ifdef GNOME
 static void show_error_dialog (GtkWindow *transient_parent,
                                const char *message_format, ...) {
         char *message;