alacarte r373 - in branches/sreeves-system-view: . Alacarte

[sreeves svn gnome org]

Author: sreeves
Date: Sat Apr 12 00:58:10 2008
New Revision: 373
URL: http://svn.gnome.org/viewvc/alacarte?rev=373&view=rev

Log:
Fix to run on 11.0

Modified:
   branches/sreeves-system-view/Alacarte/MainWindow.py
   branches/sreeves-system-view/alacarte-system.desktop.in.in
   branches/sreeves-system-view/alacarte.desktop.in.in

Modified: branches/sreeves-system-view/Alacarte/MainWindow.py
==============================================================================
--- branches/sreeves-system-view/Alacarte/MainWindow.py	(original)
+++ branches/sreeves-system-view/Alacarte/MainWindow.py	Sat Apr 12 00:58:10 2008
@@ -81,7 +81,7 @@
 			print 'XDG_DATA_DIRS after:' + os.environ['XDG_DATA_DIRS']
 
 			#Fixme - how do I get this filename generically for different distros.
-			fd = open('/etc/profile.d/xdg-enviroment.sh', 'a+')
+			fd = open('/etc/profile.d/xdg-environment.sh', 'a+')
 			already_added = False
 			try:
 				for line in fd:
@@ -185,9 +185,9 @@
 			print "SHOULD NEVER NEVER NEVER GET HERE"
 
 		if(not self.options.menu1):
-			self.options.menu1 = 'applications.menu'
+			self.options.menu1 = first_menu
 		if(not self.options.menu2):
-		    self.options.menu2 = 'preferences.menu'
+			self.options.menu2 = second_menu
 
 	def run(self):
 		print "Enter MainWindow:run"
@@ -406,7 +406,7 @@
 		if process.poll() != None:
 			if os.path.isfile(file_path):
 				#hack for broken gnome-desktop-item-edit - makes the file '700'
-				subprocess.Popen(['chmod', '644', file_path])
+				# update - should not need this on 11.0 subprocess.Popen(['chmod', '644', file_path])
 				self.editor.insertExternalItem(os.path.split(file_path)[1], parent_id)
 			return False
 		return True
@@ -419,7 +419,7 @@
 				os.rename(broken_path, file_path)
 			if os.path.isfile(file_path):
 				#hack for broken gnome-desktop-item-edit - makes the file '700'
-				subprocess.Popen(['chmod', '644', file_path])
+				#update - should not need this on 11.0 subprocess.Popen(['chmod', '644', file_path])
 				self.editor.insertExternalMenu(os.path.split(file_path)[1], parent_id)
 			return False
 		return True
@@ -534,7 +534,8 @@
 			#nasty hack for broken gnome-desktop-item-edit in gnome 2.12
 			#when editing a *.directory file it reads/writes
 			#to a hardcoded ".directory" file in the filepath dir and ignores the filename
-			if file_type == 'Menu':
+			#update - should not need this on 11.0. will test and if confirmed will remove this
+			if file_type == 'Menu' and False:
 				broken_path = os.path.join(os.path.split(file_path)[0], '.directory')
 				data = open(file_path).read()
 				open(broken_path, 'w').write(data)

Modified: branches/sreeves-system-view/alacarte-system.desktop.in.in
==============================================================================
--- branches/sreeves-system-view/alacarte-system.desktop.in.in	(original)
+++ branches/sreeves-system-view/alacarte-system.desktop.in.in	Sat Apr 12 00:58:10 2008
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Main Menu
+_Name=Main Menu - System view
 _Comment=Change which applications are shown on the main menu system wide
 Exec=alacarte --system-view=/etc/alacarte_system
 Terminal=false
 Type=Application
-StartupNotify=true
+StartupNotify=false
 Categories=GNOME;Settings;DesktopSettings;
 NotShowIn=KDE;
 Icon=alacarte

Modified: branches/sreeves-system-view/alacarte.desktop.in.in
==============================================================================
--- branches/sreeves-system-view/alacarte.desktop.in.in	(original)
+++ branches/sreeves-system-view/alacarte.desktop.in.in	Sat Apr 12 00:58:10 2008
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Main Menu
+_Name=Main Menu - User view
 _Comment=Change which applications are shown on the main menu
 Exec=alacarte
 Terminal=false