rpms/xfce4-places-plugin/devel xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch, 1.1, 1.2 xfce4-places-plugin.spec, 1.11, 1.12

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv889

Modified Files:
	xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch 
	xfce4-places-plugin.spec 
Log Message:
* Sun Aug 31 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-3
- Update xdg-userdir-compat.patch to use upstream's variable names


xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch:

Index: xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch	27 Aug 2008 13:26:33 -0000	1.1
+++ xfce4-places-plugin-1.1.0-xdg-userdir-compat.patch	30 Aug 2008 23:33:01 -0000	1.2
@@ -5,7 +5,7 @@
      ThunarVfsInfo *trash_info;
  #endif
      const gchar *home_dir = xfce_get_homedir();
-+    const gchar *desktopDir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
++    const gchar *desktop_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
  
      pbg_priv(bookmark_group)->check_changed = TRUE;
  
@@ -14,10 +14,10 @@
      /* Desktop */
      bookmark                = places_bookmark_create(_("Desktop"));
 -    bookmark->uri           = g_build_filename(home_dir, "Desktop", NULL);
-+    if (G_UNLIKELY(desktopDir == NULL)) {
++    if (G_UNLIKELY(desktop_dir == NULL)) {
 +      bookmark->uri           = g_build_filename(home_dir, "Desktop", NULL);
 +    } else {
-+      bookmark->uri           = g_strdup(desktopDir);
++      bookmark->uri           = g_strdup(desktop_dir);
 +    }
      bookmark->icon          = "gnome-fs-desktop";
      bookmark->finalize      = pbsys_finalize_desktop_bookmark;
@@ -26,17 +26,17 @@
      gboolean trash_is_empty = FALSE;
      ThunarVfsInfo *trash_info;
  #endif
-+    const gchar *desktopDir=g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
++    const gchar *desktop_dir=g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
  
      if(!pbg_priv(bookmark_group)->check_changed)
          return FALSE;
      
      /* Check if desktop now exists and didn't before */
 -    uri = g_build_filename(xfce_get_homedir(), "Desktop", NULL);
-+    if (G_UNLIKELY(desktopDir==NULL)) {
++    if (G_UNLIKELY(desktop_dir==NULL)) {
 +      uri = g_build_filename(xfce_get_homedir(), "Desktop", NULL);
 +    } else {
-+      uri = g_strdup(desktopDir);
++      uri = g_strdup(desktop_dir);
 +    }
      if(g_file_test(uri, G_FILE_TEST_IS_DIR) != pbg_priv(bookmark_group)->desktop_exists){
          g_free(uri);


Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/xfce4-places-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-places-plugin.spec	27 Aug 2008 13:37:05 -0000	1.11
+++ xfce4-places-plugin.spec	30 Aug 2008 23:33:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xfce4-places-plugin
 Version:	1.1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Places menu for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -49,6 +49,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Aug 31 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-3
+- Update xdg-userdir-compat.patch to use upstream's variable names
+
 * Wed Aug 27 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-2
 - Respect xdg user directory paths (#457740)