[patch] KDE patches

beagle-0.1.4-kde.patch (text/plain), 5.67 KB, created by Florian Hackenberger on 2006-01-16 23:05:06 UTC

--- beagle-0.1.4.old/Tiles/Tile.cs	2005-10-27 19:53:38.000000000 +0200
+++ beagle-0.1.4/Tiles/Tile.cs	2006-01-16 22:33:10.000000000 +0100
@@ -131,17 +131,12 @@
 			Process p = new Process ();
 			p.StartInfo.UseShellExecute = false;
 
 			if ((!path.StartsWith ("\"")) && (!path.EndsWith ("\"")))
 				path = "\"" + path + "\"";
-#if ENABLE_DESKTOP_LAUNCH
-			p.StartInfo.FileName = "desktop-launch";
-			p.StartInfo.Arguments = path;
-#else
-			p.StartInfo.FileName = "nautilus";
-			p.StartInfo.Arguments = "--no-desktop " + path;
-#endif
+			p.StartInfo.FileName = "kfmclient"; // KDE
+			p.StartInfo.Arguments = " exec " + path; // KDE
 			try {
 				p.Start ();
 			} catch (Exception e) {
 				Console.WriteLine ("Cannot open folder: " + e);
 			}
@@ -155,66 +150,15 @@
 		protected void OpenFromMime (Hit hit,
 					     string command_fallback,
 					     string args_fallback,
 					     bool expects_uris_fallback)
 		{
-			string argument;
-			string command = command_fallback;
-			bool expects_uris = expects_uris_fallback;
-
-			// FIXME: This is evil.  Nautilus should be handling
-			// inode/directory, not just x-directory/normal
-			if (hit.MimeType == "inode/directory")
-				hit.MimeType = "x-directory/normal";
-#if ENABLE_DESKTOP_LAUNCH
-			command = "desktop-launch";
-			expects_uris = true;
-#else		       
-			GnomeFu.VFSMimeApplication app;
-			app = GnomeFu.GetDefaultAction (hit.MimeType);
-			if (app.command != null) {
-				command = app.command;
-				expects_uris = (app.expects_uris != GnomeFu.VFSMimeApplicationArgumentType.Path);
-			}
-#endif			
-			if (command == null) {
-				LaunchError ("Can't open MimeType '{0}'", hit.MimeType);
-				return;
-			}
-
-			if (args_fallback != null)
-				argument = args_fallback;
-			else 
-				argument = "";			
-
-			if (expects_uris) {
-				argument = String.Format ("{0} '{1}'", argument, hit.Uri);
-			} else {
-				argument = String.Format ("{0} {1}", argument, hit.PathQuoted);
-			}
-
-			// Sometimes the command is 'quoted'
-			if (command.IndexOf ('\'') == 0 && command.LastIndexOf ('\'') == command.Length - 1)
-				command = command.Trim ('\'');
-
-			// This won't work if a program really has a space in
-			// the filename, but I think other things would break
-			// with that too, and in practice it doesn't seem to
-			// happen.
-			int idx = command.IndexOf (' ');
-			if (idx != -1) {
-				argument = String.Format ("{0} {1}", command.Substring (idx + 1), argument);
-				command = command.Substring (0, idx);
-			}
-
-			Console.WriteLine ("Cmd: {0}", command);
-			Console.WriteLine ("Arg: {0}", argument);
-
-			Process p = new Process ();
-			p.StartInfo.UseShellExecute = false;
-			p.StartInfo.FileName = command;
-			p.StartInfo.Arguments = argument;
+			Process p = new Process (); // KDE
+			p.StartInfo.UseShellExecute = false; // KDE
+			p.StartInfo.FileName = "kfmclient"; // KDE
+			string argument = String.Format (" exec {0}", hit.PathQuoted); // KDE
+			p.StartInfo.Arguments = argument; // KDE
 
 			try {
 				p.Start ();
 			} catch (Exception e) {
 				Console.WriteLine ("Error in OpenFromMime: " + e);
@@ -248,25 +192,28 @@
 				return;
 			}
 			
 			Process p = new Process ();
 			p.StartInfo.UseShellExecute = false;
-			p.StartInfo.FileName        = "evolution";
-			p.StartInfo.Arguments       = "\"mailto:";
+			p.StartInfo.FileName        = "kmail";
+			p.StartInfo.Arguments       = "";
 
 			if (email != null && email != "")
 				p.StartInfo.Arguments += email;
 
 			if (attach != null && attach != "")
-				p.StartInfo.Arguments += "?attach=" + attach;
+				p.StartInfo.Arguments += " --attach \"" + attach + "\"";
+
+			if (email != null && email != "")
+                                p.StartInfo.Arguments += " \"" + email + "\"";
 
 			p.StartInfo.Arguments += "\"";
 
 			try {
 				p.Start () ;
 			} catch (Exception e) {
-				Console.WriteLine ("Error launching Evolution composer: " + e);
+				Console.WriteLine ("Error launching Kmail composer: " + e);
 			}
 		}
 
 		protected void SendIm (string protocol,
 				       string screenname)
--- beagle-0.1.4.old/Tiles/TileLauncher.cs	2005-06-27 21:43:58.000000000 +0200
+++ beagle-0.1.4/Tiles/TileLauncher.cs	2006-01-16 21:15:25.000000000 +0100
@@ -71,24 +71,11 @@
 				return null;
 			if (path.StartsWith ("/")) {
 				// don't worry about themes
 				return path;
 			} else {
-				IconTheme icon_theme = new IconTheme ();
-				int base_size;
-				string icon_path;
-
-				// Try GNOME Icons
-				if (path.EndsWith (".png")) 
-					icon_path = icon_theme.LookupIcon (path.Substring (0, path.Length-4), -1, IconData.Zero, out base_size);
-				else
-					icon_path = icon_theme.LookupIcon (path, -1, IconData.Zero, out base_size);
-
-				if (icon_path != null)
-					return icon_path;
-
-				// Fall back to KDE icons
+				// Always use KDE icons
 				return BU.KdeUtils.LookupIcon (path);
 			}
 		}
 
 		// FIXME: This doesn't work for all locales
--- beagle-0.1.4.old/Tiles/TileCanvas.cs	2005-11-19 14:57:15.000000000 +0100
+++ beagle-0.1.4/Tiles/TileCanvas.cs	2006-01-16 23:18:45.000000000 +0100
@@ -98,16 +98,17 @@
 			string commandArgs = null;
 
 			if (uri.StartsWith (Uri.UriSchemeHttp)
 			    || uri.StartsWith (Uri.UriSchemeHttps)
 			    || uri.StartsWith (Uri.UriSchemeFile)) {
-				command = "gnome-open";
-				commandArgs = "'" + uri + "'";
+				command = "kfmclient";
+				commandArgs = " openURL '" + uri + "'";
 			} else if (uri.StartsWith (Uri.UriSchemeMailto)) {
-				command = "evolution";
-				commandArgs = uri;
+				command = "kmail";
+				commandArgs = " " + uri;
 			}
+			System.Console.WriteLine ("Calling: {0}{1}", command, commandArgs);
 
 			if (command != null) {
 				Process p = new Process ();
 				p.StartInfo.UseShellExecute = false;
 				p.StartInfo.FileName = command;