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