nemo r62 - in trunk: . gtk

[arj svn gnome org]

Author: arj
Date: Wed Jan  9 17:54:25 2008
New Revision: 62
URL: http://svn.gnome.org/viewvc/nemo?rev=62&view=rev

Log:
Fix installation

- clean up temporary install files in install procedure
- autostart nemo hidden so that it will index in the background for
  the user
- Fix hardcoded /usr in desktop file



Added:
   trunk/nemo-autostart.desktop.in
   trunk/nemo-hidden.in
   trunk/nemo.desktop.in
Removed:
   trunk/nemo.desktop
Modified:
   trunk/Makefile
   trunk/gtk/Main.cs
   trunk/gtk/MainWindow.cs

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Jan  9 17:54:25 2008
@@ -5,14 +5,19 @@
 	gmcs -debug -unsafe dbus/*.cs broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,sma
 ll_blue_guy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -pkg:stetic -out:$(PRG)
 
 clean:
-	@if test -f $(PRG); then rm $(PRG) nemo; fi
+	@if test -f $(PRG); then rm $(PRG); fi
 
 install: $(PRG)
 	make -C po install
+	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo.desktop.in > nemo.desktop
 	install -D nemo.desktop $(DESTDIR)/usr/share/applications/nemo.desktop
+	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo-autostart.desktop.in > nemo-autostart.desktop
+	install -D nemo-autostart.desktop $(DESTDIR)/usr/share/gnome/autostart/nemo.desktop
 	install -D images/blue_guy.png $(DESTDIR)/usr/share/nemo/nemo.png
 	install -D images/no-preview.png $(DESTDIR)/usr/share/nemo/no-preview.png
 	install -D $(PRG) $(DESTDIR)/usr/bin/$(PRG)
 	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo.in > nemo
 	install -D nemo $(DESTDIR)/usr/bin/nemo
-	@rm nemo
+	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo-hidden.in > nemo-hidden
+	install -D nemo-hidden $(DESTDIR)/usr/bin/nemo-hidden
+	@rm nemo nemo-hidden nemo.desktop nemo-autostart.desktop

Modified: trunk/gtk/Main.cs
==============================================================================
--- trunk/gtk/Main.cs	(original)
+++ trunk/gtk/Main.cs	Wed Jan  9 17:54:25 2008
@@ -10,16 +10,21 @@
 			Application.Init ();
 
 			bool reindex = false;
+			bool hidden = false;
 
-			if (args.Length > 0)
-				if (args[0] == "--reindex")
+			if (args.Length > 0) {
+				if (args[0] == "--reindex" || args.Length > 1 && args[1] == "--reindex")
 					reindex = true;
+				else if (args[0] == "--hidden" || args.Length > 1 && args[1] == "--hidden")
+					hidden = true;
 				else
 					System.Console.WriteLine(args[0]);
+			}
 			
-			MainWindow win = new MainWindow(reindex);
-			win.Show ();
-			Application.Run ();
+			MainWindow win = new MainWindow(reindex, hidden);
+			if (!hidden)
+				win.Show();
+			Application.Run();
 		}
 	}
 }
\ No newline at end of file

Modified: trunk/gtk/MainWindow.cs
==============================================================================
--- trunk/gtk/MainWindow.cs	(original)
+++ trunk/gtk/MainWindow.cs	Wed Jan  9 17:54:25 2008
@@ -23,7 +23,7 @@
 	
 	private Broker broker;
 	
-	public MainWindow(bool reindex): base ("")
+	public MainWindow(bool reindex, bool hidden): base ("")
 	{
 		// gettext
 		Mono.Unix.Catalog.Init("nemo", "/usr/share/locale");
@@ -107,6 +107,9 @@
 		// register result types
 		DocumentItem.set_fields_index(broker.RegisterItemTypes(DocumentItem.ItemTypes()));
 		PictureItem.set_fields_index(broker.RegisterItemTypes(PictureItem.ItemTypes()));
+		
+		if (hidden)
+			hide();
 	}
 
 	// Tray

Added: trunk/nemo-autostart.desktop.in
==============================================================================
--- (empty file)
+++ trunk/nemo-autostart.desktop.in	Wed Jan  9 17:54:25 2008
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Nemo
+Comment=A file manager for those who would rather have their files manage themselves
+Exec=nemo-hidden
+Icon= DESTDIR@/usr/share/nemo/nemo.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
+X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true

Added: trunk/nemo-hidden.in
==============================================================================
--- (empty file)
+++ trunk/nemo-hidden.in	Wed Jan  9 17:54:25 2008
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec -a nemo /usr/bin/mono @DESTDIR@/usr/bin/nemo.exe --hidden

Added: trunk/nemo.desktop.in
==============================================================================
--- (empty file)
+++ trunk/nemo.desktop.in	Wed Jan  9 17:54:25 2008
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Nemo
+Comment=A file manager for those who would rather have their files manage themselves
+Exec=nemo
+Icon= DESTDIR@/usr/share/nemo/nemo.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GTK;Utility;