rpms/xfdesktop/devel xfdesktop-4.4.2-xdg-userdir-compat.patch, 1.1, 1.2 xfdesktop.spec, 1.24, 1.25

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7204

Modified Files:
	xfdesktop-4.4.2-xdg-userdir-compat.patch xfdesktop.spec 
Log Message:
* Sun Aug 31 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-6
- Update xdg-userdir-compat.patch to use upstream's variable names


xfdesktop-4.4.2-xdg-userdir-compat.patch:

Index: xfdesktop-4.4.2-xdg-userdir-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop-4.4.2-xdg-userdir-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop-4.4.2-xdg-userdir-compat.patch	27 Aug 2008 18:30:01 -0000	1.1
+++ xfdesktop-4.4.2-xdg-userdir-compat.patch	31 Aug 2008 00:50:43 -0000	1.2
@@ -5,7 +5,7 @@
  xfce_desktop_setup_icon_view(XfceDesktop *desktop)
  {
      XfdesktopIconViewManager *manager = NULL;
-+    gboolean wasUserDesktopFound = TRUE;
++    gboolean was_user_desktop_found = TRUE;
      
      switch(desktop->priv->icons_style) {
          case XFCE_DESKTOP_ICON_STYLE_NONE:
@@ -19,8 +19,8 @@
 +                const gchar *desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
 +
 +                if (G_UNLIKELY (desktop_path == NULL)) {
-+                    gchar *desktop_path = xfce_get_homefile("Desktop", NULL);
-+                    wasUserDesktopFound = FALSE;
++                    desktop_path = xfce_get_homefile("Desktop", NULL);
++                    was_user_desktop_found = FALSE;
 +                }
                  path = thunar_vfs_path_new(desktop_path, NULL);
                  if(path) {
@@ -30,7 +30,7 @@
                                 desktop_path);
                  }
 -                g_free(desktop_path);
-+                if (wasUserDesktopFound == FALSE)
++                if (G_UNLIKELY(was_user_desktop_found == FALSE))
 +                  g_free(desktop_path);
              }
              break;


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xfdesktop.spec	27 Aug 2008 18:30:01 -0000	1.24
+++ xfdesktop.spec	31 Aug 2008 00:50:44 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2
@@ -108,7 +108,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Aug 27 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
+* Sun Aug 31 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-6
+- Update xdg-userdir-compat.patch to use upstream's variable names
+
+* Wed Aug 27 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-5
 - Use Fedora icon for desktop menu plugin (#445986)
 - Respect xdg user directory paths (#457740)
 - Fix menu icons