rpms/control-center/devel control-center.spec, 1.296, 1.297 gnome-bg.patch, 1.1, 1.2

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Aug 17 16:26:32 UTC 2007 

Author: mclasen

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

Modified Files:
	control-center.spec gnome-bg.patch 
Log Message:
small improvements



Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- control-center.spec	16 Aug 2007 06:51:29 -0000	1.296
+++ control-center.spec	17 Aug 2007 16:25:59 -0000	1.297
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.19.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
@@ -380,6 +380,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Aug 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-3
+- Improve tooltips for slide shows
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-2
 - Port Soerens background patch to the appearance capplet
 

gnome-bg.patch:

Index: gnome-bg.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/gnome-bg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-bg.patch	16 Aug 2007 06:51:29 -0000	1.1
+++ gnome-bg.patch	17 Aug 2007 16:25:59 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.h.gnome-bg gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.h
 --- gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.h.gnome-bg	2007-05-03 08:33:46.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.h	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.h	2007-08-17 10:09:19.000000000 -0400
 @@ -40,7 +40,6 @@ struct _GnomeWPInfo {
  
  GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
@@ -11,7 +11,7 @@
  #endif
 diff -up gnome-control-center-2.19.90/capplets/appearance/gnome-wp-xml.c.gnome-bg gnome-control-center-2.19.90/capplets/appearance/gnome-wp-xml.c
 --- gnome-control-center-2.19.90/capplets/appearance/gnome-wp-xml.c.gnome-bg	2007-08-13 17:39:44.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-xml.c	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-xml.c	2007-08-17 10:09:19.000000000 -0400
 @@ -235,7 +235,11 @@ static void gnome_wp_xml_load_xml (Appea
  	g_hash_table_insert (data->wp_hash, wp->filename, wp);
        } else {
@@ -26,7 +26,7 @@
    xmlFreeDoc (wplist);
 diff -up gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.c.gnome-bg gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.c
 --- gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.c.gnome-bg	2007-05-03 08:33:46.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.c	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-info.c	2007-08-17 10:09:19.000000000 -0400
 @@ -67,27 +67,6 @@ GnomeWPInfo * gnome_wp_info_new (const g
    return new;
  }
@@ -57,7 +57,7 @@
      return;
 diff -up gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.h.gnome-bg gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.h
 --- gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.h.gnome-bg	2007-05-03 08:33:46.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.h	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.h	2007-08-17 10:09:19.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <libgnomeui/gnome-thumbnail.h>
  #include <gnome-wp-info.h>
@@ -97,7 +97,7 @@
  
 diff -up gnome-control-center-2.19.90/capplets/appearance/appearance-desktop.c.gnome-bg gnome-control-center-2.19.90/capplets/appearance/appearance-desktop.c
 --- gnome-control-center-2.19.90/capplets/appearance/appearance-desktop.c.gnome-bg	2007-08-13 17:39:44.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/appearance-desktop.c	2007-08-16 02:40:50.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/appearance-desktop.c	2007-08-17 10:09:19.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <gconf/gconf-client.h>
@@ -160,7 +160,7 @@
  
 diff -up gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.c.gnome-bg gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.c
 --- gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.c.gnome-bg	2007-07-30 16:26:57.000000000 -0400
-+++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.c	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/capplets/appearance/gnome-wp-item.c	2007-08-17 12:11:15.000000000 -0400
 @@ -25,10 +25,56 @@
  #include <gnome.h>
  #include <string.h>
@@ -462,9 +462,34 @@
  }
  
  void gnome_wp_item_update_description (GnomeWPItem * item) {
+@@ -356,16 +237,22 @@ void gnome_wp_item_update_description (G
+   if (!strcmp (item->filename, "(none)")) {
+     item->description = g_strdup (item->name);
+   } else {
++    gchar *description;
++
++    if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
++      description = _("Slide show");
++    else
++      description = gnome_vfs_mime_get_description (item->fileinfo->mime_type); 
+     /* translators: <b>wallpaper name</b>
+      * mime type, x pixel(s) by y pixel(s)
+      * Folder: /path/to/file
+      */
+     item->description =
+-        g_markup_printf_escaped (_("<b>%s</b>\n"
++         g_markup_printf_escaped (_("<b>%s</b>\n"
+                                    "%s, %d %s by %d %s\n"
+                                    "Folder: %s"),
+                                  item->name,
+-                                 gnome_vfs_mime_get_description (item->fileinfo->mime_type),
++                                 description,
+                                  item->width,
+                                  ngettext ("pixel", "pixels", item->width),
+                                  item->height,
 diff -up gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c.gnome-bg gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c
 --- gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c.gnome-bg	2007-07-02 08:30:05.000000000 -0400
-+++ gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c	2007-08-16 02:35:10.000000000 -0400
++++ gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c	2007-08-17 10:09:20.000000000 -0400
 @@ -30,11 +30,13 @@
  #include <gdk/gdk.h>
  #include <gdk/gdkx.h>

More information about the scm-commits mailing list