diff -Naur monkey-bubble-0.4.0-old/data/monkey-bubble.glade monkey-bubble-0.4.0/data/monkey-bubble.glade --- monkey-bubble-0.4.0-old/data/monkey-bubble.glade 2006-07-30 17:25:36.000000000 +0300 +++ monkey-bubble-0.4.0/data/monkey-bubble.glade 2009-07-30 02:04:38.590785257 +0300 @@ -138,26 +138,6 @@ - - True - _Contents - True - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - True _About diff -Naur monkey-bubble-0.4.0-old/src/ui/ui-main.c monkey-bubble-0.4.0/src/ui/ui-main.c --- monkey-bubble-0.4.0-old/src/ui/ui-main.c 2006-08-01 16:47:04.000000000 +0300 +++ monkey-bubble-0.4.0/src/ui/ui-main.c 2009-07-30 01:48:14.055871796 +0300 @@ -87,13 +87,6 @@ guint callback_action, GtkWidget *widget); -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_preferences_dialog(gpointer callback_data, guint callback_action, GtkWidget *widget); @@ -250,10 +243,6 @@ g_signal_connect_swapped( G_OBJECT( PRIVATE(ui_main)->window),"delete-event",GTK_SIGNAL_FUNC(quit_program),NULL); - item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"help_contents"); - g_signal_connect_swapped(item, "activate", - GTK_SIGNAL_FUNC(show_help_content), ui_main); - g_signal_connect_swapped ( glade_xml_get_widget (PRIVATE(ui_main)->glade_xml,"about"), "activate", @@ -633,46 +622,3 @@ g_object_unref( logo); } -static void show_help_content(gpointer callback_data, - guint callback_action, - GtkWidget *widget) { - 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), - _("There was an error displaying help: %s"), - err->message); - g_error_free (err); - } -} - -static void show_error_dialog (GtkWindow *transient_parent, - const char *message_format, ...) { - char *message; - va_list args; - - if (message_format) { - va_start (args, message_format); - message = g_strdup_vprintf (message_format, args); - va_end (args); - } else { - message = NULL; - } - - GtkWidget *dialog; - dialog = gtk_message_dialog_new (transient_parent, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - message); - - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL); - - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - - gtk_widget_show_all (dialog); -}