rpms/gnome-panel/devel clock-help.patch,NONE,1.1

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16555

Added Files:
	clock-help.patch 
Log Message:
forgotten patch


clock-help.patch:

--- NEW FILE clock-help.patch ---
diff -up gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help gnome-panel-2.22.1.2/applets/clock/clock.c
--- gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help	2008-04-16 21:23:29.000000000 -0400
+++ gnome-panel-2.22.1.2/applets/clock/clock.c	2008-04-16 21:23:33.000000000 -0400
@@ -2954,21 +2954,6 @@ set_custom_format_cb (GtkEntry  *entry,
 }
 
 static void
-properties_response_cb (GtkWidget *widget,
-			int        id,
-			ClockData *cd)
-{
-        /* FMQ: was used from old preferences dialog; fix this up */
-
-	if (id == GTK_RESPONSE_HELP)
-		clock_utils_display_help (cd->applet,
-					  "clock", "clock", "clock-settings");
-
-	else
-		gtk_widget_destroy (widget);
-}
-
-static void
 prefs_locations_changed (GtkTreeSelection *selection, ClockData *cd)
 {
 	gint n;
@@ -3693,6 +3678,13 @@ prefs_hide_event (GtkWidget *widget, Gdk
         return TRUE;
 }
 
+static void
+prefs_help (GtkWidget *widget, ClockData *cd)
+{
+	clock_utils_display_help (cd->applet,
+				  "clock", "clock", "clock-settings");
+}
+
 typedef struct {
   const gchar *name;
   const gchar *country_code;
@@ -4147,6 +4139,7 @@ ensure_prefs_window_is_created (ClockDat
 {
         GtkWidget *edit_window;
 	GtkWidget *prefs_close_button;
+	GtkWidget *prefs_help_button;
         GtkWidget *edit_cancel_button;
         GtkWidget *edit_ok_button;
         GtkWidget *zone_combo;
@@ -4163,6 +4156,7 @@ ensure_prefs_window_is_created (ClockDat
 	gtk_window_set_icon_name (GTK_WINDOW (cd->prefs_window), CLOCK_ICON);
 
         prefs_close_button = glade_xml_get_widget (cd->glade_xml, "prefs-close-button");
+        prefs_help_button = glade_xml_get_widget (cd->glade_xml, "prefs-help-button");
         cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml, "cities_list"));
 
         selection = gtk_tree_view_get_selection (cd->prefs_locations);
@@ -4175,6 +4169,9 @@ ensure_prefs_window_is_created (ClockDat
         g_signal_connect (G_OBJECT (prefs_close_button), "clicked",
                           G_CALLBACK (prefs_hide), cd);
 
+        g_signal_connect (G_OBJECT (prefs_help_button), "clicked",
+                          G_CALLBACK (prefs_help), cd);
+
         cd->prefs_location_remove_button = glade_xml_get_widget (cd->glade_xml, "prefs-locations-remove-button");
 
         g_signal_connect (G_OBJECT (cd->prefs_location_remove_button), "clicked",