r9448 - in /desktop/experimental/nautilus/debian: changelog patches/10_location_titlebar.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Mar 29 22:08:23 CET 2007 

Author: joss
Date: Thu Mar 29 21:08:22 2007
New Revision: 9448

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9448
Log:
* 10_location_titlebar.patch: patch from Adrien Delle Cave to display 
  the full location in the title bar when a setting is enabled
  (closes: #413018).

Added:
    desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch
Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/patches/series

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=9448&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Thu Mar 29 21:08:22 2007
@@ -1,3 +1,11 @@
+nautilus (2.16.3-6) UNRELEASED; urgency=low
+
+  * 10_location_titlebar.patch: patch from Adrien Delle Cave to display 
+    the full location in the title bar when a setting is enabled
+    (closes: #413018).
+
+ -- Josselin Mouette <joss at debian.org>  Sat,  3 Mar 2007 23:21:04 +0100
+
 nautilus (2.16.3-5) experimental; urgency=low
 
   * Bump up librsvg2-dev build-dep to >= 2.16.0-2 to make the package

Added: desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch?rev=9448&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch (added)
+++ desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch Thu Mar 29 21:08:22 2007
@@ -1,0 +1,119 @@
+Index: nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/apps_nautilus_preferences.schemas.in	2006-06-15 11:38:40.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in	2007-03-03 22:39:32.000000000 +0100
+@@ -720,6 +720,21 @@
+       </locale>
+     </schema>
+ 
++     <schema>
++      <key>/schemas/apps/nautilus/preferences/location_in_title_bar</key>
++      <applyto>/apps/nautilus/preferences/location_in_title_bar</applyto>
++      <owner>nautilus</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++         <short>Show current location in title bar</short>
++         <long>
++         If set to true, windows will have the full location displayed
++         in their title bar. Otherwise it will only show the folder name.
++         </long>
++      </locale>
++    </schema>
++
+     <schema>
+       <key>/schemas/apps/nautilus/preferences/side_pane_view</key>
+       <applyto>/apps/nautilus/preferences/side_pane_view</applyto>
+Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.c	2006-07-21 19:18:56.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c	2007-03-03 22:40:31.000000000 +0100
+@@ -376,6 +376,10 @@
+ 	  PREFERENCE_BOOLEAN,
+ 	  GINT_TO_POINTER (TRUE)
+ 	},
++	{ NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR,
++	  PREFERENCE_BOOLEAN,
++	  GINT_TO_POINTER (TRUE)
++	},
+ 	{ NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
+ 	  PREFERENCE_BOOLEAN,
+ 	  GINT_TO_POINTER (TRUE)
+Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.h	2006-07-21 19:18:56.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h	2007-03-03 22:41:48.000000000 +0100
+@@ -84,6 +84,7 @@
+ #define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR		"preferences/start_with_location_bar"
+ #define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY		"preferences/always_use_location_entry"
+ #define NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR		"preferences/start_with_status_bar"
++#define NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR		"preferences/location_in_title_bar"
+ #define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR		 	"preferences/start_with_sidebar"
+ #define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR			"preferences/start_with_toolbar"
+ #define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW                     "preferences/side_pane_view"
+Index: nautilus-2.16.3/src/nautilus-navigation-window.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-navigation-window.c	2006-10-02 12:53:45.000000000 +0200
++++ nautilus-2.16.3/src/nautilus-navigation-window.c	2007-03-03 23:20:34.000000000 +0100
+@@ -895,20 +895,32 @@
+ static gboolean
+ real_set_title (NautilusWindow *window, const char *title)
+ {
+-	char *full_title;
+-	char *window_title;
+ 	gboolean changed;
+ 
+ 	changed = EEL_CALL_PARENT_WITH_RETURN_VALUE
+ 		(NAUTILUS_WINDOW_CLASS, set_title, (window, title));
+ 
+ 	if (changed) {
++		char *full_title;
++		char *window_title;
++		char *tmp_title = NULL;
++		char *uri = NULL;
++		char *location;
++
++		if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
++		    (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
++		    (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
++			title = tmp_title = g_strdup_printf("%s (%s)",title,location);
++			g_free (location);
++		}
+ 		full_title = g_strdup_printf (_("%s - File Browser"), title);
+ 
+ 		window_title = eel_str_middle_truncate (full_title, MAX_TITLE_LENGTH);
+ 		gtk_window_set_title (GTK_WINDOW (window), window_title);
+ 		g_free (window_title);
+ 		g_free (full_title);
++		g_free (tmp_title);
++		g_free (uri);
+ 	}
+ 
+ 	return changed;
+Index: nautilus-2.16.3/src/nautilus-spatial-window.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-spatial-window.c	2006-08-07 12:34:31.000000000 +0200
++++ nautilus-2.16.3/src/nautilus-spatial-window.c	2007-03-03 23:20:19.000000000 +0100
+@@ -424,10 +424,22 @@
+ 		gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+ 	} else if (changed) {
+ 		char *window_title;
++		char *tmp_title = NULL;
++		char *uri = NULL;
++		char *location;
++
++		if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
++		    (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
++		    (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
++			title = tmp_title = g_strdup_printf("%s (%s)",title,location);
++			g_free (location);
++		}
+ 
+ 		window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
+ 		gtk_window_set_title (GTK_WINDOW (window), window_title);
+ 		g_free (window_title);
++		g_free (tmp_title);
++		g_free (uri);
+ 	}
+ 
+ 	return changed;

Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=9448&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series (original)
+++ desktop/experimental/nautilus/debian/patches/series Thu Mar 29 21:08:22 2007
@@ -6,4 +6,5 @@
 07_desktop_file_activation.patch
 08_folder_handler.patch
 09_connect_server_iter.patch
+10_location_titlebar.patch
 11_umount-progress-bar.patch

More information about the pkg-gnome-commits mailing list