rpms/control-center/devel capplet-help.patch, NONE, 1.1 control-center.spec, 1.397, 1.398

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26703

Modified Files:
	control-center.spec 
Added Files:
	capplet-help.patch 
Log Message:
fix help buttons in appearance capplet


capplet-help.patch:

--- NEW FILE capplet-help.patch ---
diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c
--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help	2008-10-04 01:40:15.000000000 -0400
+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c	2008-10-04 01:40:34.000000000 -0400
@@ -85,6 +85,38 @@ main_window_response (GtkWidget *widget,
     g_object_unref (data->client);
     g_object_unref (data->xml);
   }
+  else if (response_id == GTK_RESPONSE_HELP)
+  {
+      GtkNotebook *nb;
+      gint pindex;
+
+      nb = GTK_NOTEBOOK (glade_xml_get_widget (data->xml, "main_notebook"));
+      pindex = gtk_notebook_get_current_page (nb);
+
+      switch (pindex)
+      {
+        case 0: /* theme */
+          capplet_help (GTK_WINDOW (widget), "user-guide.xml", 
+                                    "goscustdesk-12"); 
+          break;
+        case 1: /* background */
+          capplet_help (GTK_WINDOW (widget), "user-guide.xml", 
+                                    "goscustdesk-7"); 
+          break;
+        case 2: /* fonts */
+          capplet_help (GTK_WINDOW (widget), "user-guide.xml", 
+                                    "goscustdesk-38"); 
+          break;
+        case 3: /* interface */
+          capplet_help (GTK_WINDOW (widget), "user-guide.xml", 
+                                    "goscustuserinter-2"); 
+          break;
+        default:
+          capplet_help (GTK_WINDOW (widget), "user-guide.xml", 
+                                    "prefs-look-and-feel"); 
+          break;
+       }
+  }
 }
 
 int
diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c
--- gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help	2008-10-04 01:40:24.000000000 -0400
+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c	2008-10-04 01:40:34.000000000 -0400
@@ -392,7 +392,7 @@ static void
 style_response_cb (GtkDialog *dialog, gint response_id)
 {
   if (response_id == GTK_RESPONSE_HELP) {
-    /* FIXME: help */
+    capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61");
   } else {
     gtk_widget_hide (GTK_WIDGET (dialog));
   }


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- control-center.spec	30 Sep 2008 23:18:39 -0000	1.397
+++ control-center.spec	4 Oct 2008 05:44:06 -0000	1.398
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -40,6 +40,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=554507
 Patch25: ta-schema.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=554957
+Patch28: capplet-help.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
 Patch96: control-center-2.23.2-gecos.patch
@@ -165,6 +168,7 @@
 %patch8 -p1 -b .gtkmarshal
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
+%patch28 -p1 -b .capplet-help
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -334,6 +338,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat Oct  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-3
+- Fix help buttons in the appearance capplet
+
 * Tue Sep 30 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-2
 - Fix a schema mistranslation