[X2go-Commits] x2gognomebindings.git - master (branch) updated: 2.0.1.1-29-g7b3fe1e

[X2go dev team]

The branch, master has been updated
       via  7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea (commit)
       via  50b5f49c02b336c3688b15641dd1a3232e2819a4 (commit)
      from  66c2defe1fec986c61ded31ba52e27bb6afbde6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 26 03:42:58 2011 +0200

    Let x2goumount-session-gnome be able to handle icons with blanks in their name.

commit 50b5f49c02b336c3688b15641dd1a3232e2819a4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 26 03:41:42 2011 +0200

    Provide more GNOME'ish way to derive icon path name from GNOME object URI.

-----------------------------------------------------------------------

Summary of changes:
 bin/x2goumount-session-gnome    |    2 +-
 debian/changelog                |    4 ++++
 extension/nautilus-x2goumount.c |   11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome
index 7d160f2..7133d07 100755
--- a/bin/x2goumount-session-gnome
+++ b/bin/x2goumount-session-gnome
@@ -25,7 +25,7 @@ use strict;
 use lib "/usr/lib/x2go";
 use x2godbwrapper; 
 
-my $fname=shift;
+my $fname=join(" ", @ARGV);
 open(F,"<$fname") or die "can't open $fname";
 my $dir=<F>;
 my $session=<F>;
diff --git a/debian/changelog b/debian/changelog
index 22231d2..13950a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low
     - Rename sshfs.xml to sshfs-x2go-gnome.xml.
     - Use desktop icon names that contain the name of the desktop session.
     - Allow blanks in desktop icon names.
+    - Provide more GNOME'ish way to derive icon path name from GNOME object
+      URI.
+    - Let x2goumount-session-gnome be able to handle icons with blanks in
+      their name.
   * Add gnome-menus as dependency.
   * Now fully use debhelper for packaging. Reduced linitian issues
     nearly completely (still open: old-format-menu-file
diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c
index 38cd7af..081abbe 100644
--- a/extension/nautilus-x2goumount.c
+++ b/extension/nautilus-x2goumount.c
@@ -46,13 +46,14 @@ static void nautilus_x2goumount_execute (NautilusMenuItem *item)
 {
 	GList *files;
 	files = (GList*)g_object_get_data (G_OBJECT (item), "files");
-	gchar* uri;
-	sprintf(uri, "'%s'", nautilus_file_info_get_uri ((NautilusFileInfo *)files->data));
-	char* cmd=malloc(strlen(uri)+strlen("x2goumount-session-gnome"));
+	gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo *)files->data);
+	gchar *file_path = g_filename_from_uri (uri, NULL, NULL);
+	char* cmd=malloc(strlen(file_path)+strlen("x2goumount-session-gnome"));
 	strcpy(cmd,"x2goumount-session-gnome ");
-	strcat(cmd, uri+7);
+	strcat(cmd, file_path);
 	g_spawn_command_line_async (cmd, NULL);
-        g_free (uri);
+	g_free (uri);
+	g_free (file_path);
 }
 
 static const gchar* get_verified_icon_name (const gchar* icon_name)


hooks/post-receive
-- 
x2gognomebindings.git (X2go bindings for GNOME)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gognomebindings.git" (X2go bindings for GNOME).