[X2Go-Commits] x2gomatebindings.git - build-main (branch) updated: 50b5f49c02b336c3688b15641dd1a3232e2819a4

X2Go dev team git-admin at x2go.org
Fri Jul 26 18:33:36 CEST 2013


The branch, build-main has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                |    1 +
 extension/nautilus-x2goumount.c |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 22231d2..3eb8714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ 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.
   * 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
-- 
x2gomatebindings.git (x2gomatebindings upstream project)

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 "x2gomatebindings.git" (x2gomatebindings upstream project).




More information about the x2go-commits mailing list