rpms/control-center/devel no-fonts.patch, NONE, 1.1 control-center.spec, 1.326, 1.327

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22935

Modified Files:
	control-center.spec 
Added Files:
	no-fonts.patch 
Log Message:
Remove a nonworking button


no-fonts.patch:

--- NEW FILE no-fonts.patch ---
diff -up gnome-control-center-2.21.5/capplets/appearance/data/appearance.glade.no-fonts gnome-control-center-2.21.5/capplets/appearance/data/appearance.glade
--- gnome-control-center-2.21.5/capplets/appearance/data/appearance.glade.no-fonts	2008-01-22 11:30:59.000000000 -0500
+++ gnome-control-center-2.21.5/capplets/appearance/data/appearance.glade	2008-01-22 11:38:08.000000000 -0500
@@ -619,19 +619,6 @@
               </widget>
             </child>
             <child>
-              <widget class="GtkButton" id="go_to_font_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label" translatable="yes">Go _to Fonts Folder</property>
-                <property name="use_underline">True</property>
-                <property name="response_id">1</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
               <widget class="GtkButton" id="button3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -641,7 +628,7 @@
                 <property name="response_id">-7</property>
               </widget>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>
diff -up gnome-control-center-2.21.5/capplets/appearance/appearance-font.c.no-fonts gnome-control-center-2.21.5/capplets/appearance/appearance-font.c
--- gnome-control-center-2.21.5/capplets/appearance/appearance-font.c.no-fonts	2008-01-22 11:31:23.000000000 -0500
+++ gnome-control-center-2.21.5/capplets/appearance/appearance-font.c	2008-01-22 11:37:48.000000000 -0500
@@ -805,9 +805,6 @@ cb_details_response (GtkDialog *dialog, 
     capplet_help (GTK_WINDOW (dialog),
 		  "user-guide.xml",
 		  "goscustdesk-38");
-  } else if (response_id == 1) {
-    /* "Go to font folder" was clicked */
-    g_spawn_command_line_async ("nautilus --no-desktop fonts:///", NULL);
   } else
     gtk_widget_hide (GTK_WIDGET (dialog));
 }
@@ -817,20 +814,11 @@ cb_show_details (GtkWidget *button,
 		 AppearanceData *data)
 {
   if (!data->font_details) {
-    GnomeVFSURI *uri;
     GtkAdjustment *adjustment;
     GtkWidget *widget;
     EnumGroup *group;
 
     data->font_details = glade_xml_get_widget (data->xml, "render_details");
-    uri = gnome_vfs_uri_new ("fonts:///");
-    widget = glade_xml_get_widget (data->xml, "go_to_font_button");
-    if (uri == NULL) {
-      gtk_widget_hide (widget);
-    } else {
-      gnome_vfs_uri_unref (uri);
-      gtk_widget_show (widget);
-    }
 
     gtk_window_set_transient_for (GTK_WINDOW (data->font_details),
 				  GTK_WINDOW (glade_xml_get_widget (data->xml, "appearance_window")));


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- control-center.spec	18 Jan 2008 16:38:38 -0000	1.326
+++ control-center.spec	22 Jan 2008 17:03:44 -0000	1.327
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -35,9 +35,8 @@
 # Fix some useless warnings in libslab
 # http://bugzilla.gnome.org/show_bug.cgi?id=439398
 Patch6: gnome-control-center-2.19.90-no-warnings.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=430889
-# disable for now, upstream plans conflicting changes
-#Patch16: control-center-2.18.0-be-more-async.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=511306
+Patch7: no-fonts.patch
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.19.91-passwd.patch
 Patch96: control-center-2.19.90-gecos.patch
@@ -163,7 +162,7 @@
 pushd libslab
 %patch6 -p0 -b .warnings
 popd
-#%patch16 -p1 -b .be-more-async
+%patch7 -p1 -b .no-fonts
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -346,6 +345,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Jan 22 2008  Matthias Clasen <mclasen at redhat.com> - 2.21.5-2
+- Disable font folder support
+
 * Thu Jan 17 2008 - Bastien Nocera <bnocera at redhat.com> - 2.21.5-1
 - Update to 2.21.5