rpms/nautilus/devel nautilus-xdg-user-dirs.patch, 1.1, 1.2 nautilus.spec, 1.144, 1.145
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 6 13:23:33 UTC 2007
Author: alexl
Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19405
Modified Files:
nautilus-xdg-user-dirs.patch nautilus.spec
Log Message:
* Tue Mar 6 2007 Alexander Larsson <alexl at redhat.com> - 2.17.92-3
- Update xdg-user-dirs patch, now handle renaming desktop dir
nautilus-xdg-user-dirs.patch:
libnautilus-private/nautilus-file-utilities.c | 298 +++++++++++++++++++++++++-
libnautilus-private/nautilus-file-utilities.h | 2
libnautilus-private/nautilus-file.c | 1
libnautilus-private/nautilus-signaller.c | 9
src/file-manager/fm-directory-view.c | 103 ++++++--
5 files changed, 380 insertions(+), 33 deletions(-)
Index: nautilus-xdg-user-dirs.patch
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus-xdg-user-dirs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-xdg-user-dirs.patch 2 Mar 2007 15:06:35 -0000 1.1
+++ nautilus-xdg-user-dirs.patch 6 Mar 2007 13:23:31 -0000 1.2
@@ -1,6 +1,6 @@
Index: src/file-manager/fm-directory-view.c
===================================================================
---- src/file-manager/fm-directory-view.c (revision 12767)
+--- src/file-manager/fm-directory-view.c (revision 12790)
+++ src/file-manager/fm-directory-view.c (working copy)
@@ -151,6 +151,7 @@
#define FM_DIRECTORY_VIEW_POPUP_PATH_LOCATION "/location"
@@ -214,9 +214,21 @@
}
+Index: libnautilus-private/nautilus-file.c
+===================================================================
+--- libnautilus-private/nautilus-file.c (revision 12790)
++++ libnautilus-private/nautilus-file.c (working copy)
+@@ -839,7 +839,6 @@ nautilus_file_can_rename (NautilusFile *
+ }
+
+ if ((is_desktop_file (file) && !can_rename_desktop_file (file)) ||
+- nautilus_file_is_desktop_directory (file) ||
+ nautilus_file_is_home (file)) {
+ return FALSE;
+ }
Index: libnautilus-private/nautilus-file-utilities.c
===================================================================
---- libnautilus-private/nautilus-file-utilities.c (revision 12767)
+--- libnautilus-private/nautilus-file-utilities.c (revision 12790)
+++ libnautilus-private/nautilus-file-utilities.c (working copy)
@@ -31,6 +31,7 @@
#include "nautilus-metafile.h"
@@ -226,15 +238,18 @@
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
-@@ -49,6 +50,7 @@
+@@ -49,6 +50,10 @@
#define LEGACY_DESKTOP_DIRECTORY_NAME ".gnome-desktop"
#define DEFAULT_DESKTOP_DIRECTORY_MODE (0755)
+static void update_xdg_dir_cache (void);
++static void schedule_user_dirs_changed (void);
++static void desktop_dir_changed (void);
++
char *
nautilus_compute_title_for_uri (const char *text_uri)
-@@ -148,15 +150,277 @@ nautilus_get_user_directory (void)
+@@ -148,15 +153,280 @@ nautilus_get_user_directory (void)
return user_directory;
}
@@ -384,6 +399,8 @@
+ G_SPAWN_STDERR_TO_DEV_NULL,
+ NULL, NULL,
+ NULL, NULL, NULL, NULL);
++ schedule_user_dirs_changed ();
++ desktop_dir_changed ();
+ }
+ }
+ g_free (file_uri);
@@ -445,6 +462,7 @@
+ g_free (cached_xdg_dirs);
+
+ schedule_user_dirs_changed ();
++ desktop_dir_changed ();
+ }
+
+ if (!started_monitor) {
@@ -514,7 +532,7 @@
}
/**
-@@ -231,11 +495,22 @@ nautilus_get_home_directory_uri (void)
+@@ -231,11 +501,22 @@ nautilus_get_home_directory_uri (void)
}
@@ -539,9 +557,33 @@
}
void
+@@ -283,8 +564,9 @@ static char *escaped_desktop_dir_dirname
+ static char *escaped_desktop_dir_filename = NULL;
+ static gboolean desktop_dir_changed_callback_installed = FALSE;
+
++
+ static void
+-desktop_dir_changed_callback (gpointer callback_data)
++desktop_dir_changed (void)
+ {
+ g_free (escaped_desktop_dir);
+ g_free (escaped_desktop_dir_filename);
+@@ -295,6 +577,12 @@ desktop_dir_changed_callback (gpointer c
+ }
+
+ static void
++desktop_dir_changed_callback (gpointer callback_data)
++{
++ desktop_dir_changed ();
++}
++
++static void
+ update_desktop_dir (void)
+ {
+ char *uri, *path;
Index: libnautilus-private/nautilus-file-utilities.h
===================================================================
---- libnautilus-private/nautilus-file-utilities.h (revision 12767)
+--- libnautilus-private/nautilus-file-utilities.h (revision 12790)
+++ libnautilus-private/nautilus-file-utilities.h (working copy)
@@ -37,6 +37,7 @@ gboolean nautilus_file_name_matches_back
/* These functions all return something something that needs to be
@@ -561,7 +603,7 @@
void nautilus_create_templates_directory (void);
Index: libnautilus-private/nautilus-signaller.c
===================================================================
---- libnautilus-private/nautilus-signaller.c (revision 12767)
+--- libnautilus-private/nautilus-signaller.c (revision 12790)
+++ libnautilus-private/nautilus-signaller.c (working copy)
@@ -39,6 +39,7 @@ enum {
HISTORY_LIST_CHANGED,
Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- nautilus.spec 2 Mar 2007 15:06:35 -0000 1.144
+++ nautilus.spec 6 Mar 2007 13:23:31 -0000 1.145
@@ -19,7 +19,7 @@
Name: nautilus
Summary: Nautilus is a file manager for GNOME
Version: 2.17.92
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
@@ -210,6 +210,9 @@
%{_libdir}/*.so
%changelog
+* Tue Mar 6 2007 Alexander Larsson <alexl at redhat.com> - 2.17.92-3
+- Update xdg-user-dirs patch, now handle renaming desktop dir
+
* Thu Mar 1 2007 Alexander Larsson <alexl at redhat.com> - 2.17.92-2
- Add xdg-user-dirs patch
More information about the fedora-cvs-commits
mailing list