From cf6b1e7a53864e801afcb8204340a95a5ba2c7ce Mon Sep 17 00:00:00 2001
From: Clement Lefebvre <root@linuxmint.com>
Date: Sun, 9 May 2010 11:51:41 +0100
Subject: [PATCH] Custom places now understand ~ sign and listen to changes in
 path

---
 debian/changelog                                | 6 ++++++
 usr/lib/linuxmint/mintMenu/mintMenuConfig.glade | 9 ++++-----
 usr/lib/linuxmint/mintMenu/mintMenuConfig.py    | 2 +-
 usr/lib/linuxmint/mintMenu/plugins/places.py    | 5 ++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df01c65..946b403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (4.9.9) isadora; urgency=low
+
+  * Custom places: now understands ~ signs and listens to changes in the path
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun,  09 May 2010 11:51:00 +0000
+
 mintmenu (4.9.8) isadora; urgency=low
 
   * Removed suggestion "search in portal"
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 4eb7ff7..945c297 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -4,7 +4,8 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="border_width">6</property>
+    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
@@ -16,10 +17,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="border_width">6</property>
-            <property name="tab_border">0</property>
-            <property name="tab_hborder">0</property>
-            <property name="tab_vborder">0</property>
+            <property name="border_width">4</property>
             <child>
               <widget class="GtkFrame" id="frame18">
                 <property name="visible">True</property>
@@ -1067,6 +1065,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="hscrollbar_policy">automatic</property>
                                         <property name="vscrollbar_policy">automatic</property>
+                                        <property name="shadow_type">etched-in</property>
                                         <child>
                                           <widget class="GtkTreeView" id="customplacestree">
                                             <property name="visible">True</property>
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 1908df8..92dc1d5 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -444,7 +444,7 @@ class mintMenuConfig( object ):
 		else:
 			self.systemHeightButton.set_sensitive(False)
 
-	def updatePlacesGconf(self, treemodel, path, iter = None, new_order = None):
+	def updatePlacesGconf(self, treemodel, path, iter = None, new_order = None):		
 # Do only if not partway though an append operation; Append = insert+change+change and each creates a signal
 		if ((iter == None) or (self.customplacestreemodel.get_value(iter, 1) != None)):
 			treeiter = self.customplacestreemodel.get_iter_first()
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py
index 2f2a3f7..dc9d67b 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/places.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.py
@@ -55,6 +55,7 @@ class pluginclass( object ):
 		self.gconf.notifyAdd( "show_network", self.RegenPlugin )
 		self.gconf.notifyAdd( "show_trash", self.RegenPlugin )
 		self.gconf.notifyAdd( "custom_names", self.RegenPlugin )
+		self.gconf.notifyAdd( "custom_paths", self.RegenPlugin )
 		self.gconf.notifyAdd( "allowScrollbar", self.RegenPlugin )
 		self.gconf.notifyAdd( "height", self.changePluginSize )
 		self.gconf.notifyAdd( "width", self.changePluginSize )		
@@ -192,7 +193,9 @@ class pluginclass( object ):
 			
 	def do_custom_places( self ):		
 		for index in range( len(self.custompaths) ):
-			command = ( "nautilus \"" + self.custompaths[index] + "\"")
+			path = self.custompaths[index]
+			path = path.replace("~", home)
+			command = ( "nautilus \"" + path + "\"")
 			currentbutton = easyButton( "folder", self.iconsize, [self.customnames[index]], -1, -1 )
 			currentbutton.connect( "clicked", self.ButtonClicked, command )
 			currentbutton.show()