diff -u nautilus-sendto-0.13.2/debian/changelog nautilus-sendto-0.13.2/debian/changelog --- nautilus-sendto-0.13.2/debian/changelog +++ nautilus-sendto-0.13.2/debian/changelog @@ -1,3 +1,15 @@ +nautilus-sendto (0.13.2-0ubuntu3) hardy-proposed; urgency=low + + * debian/patches/91_from_svn_fix_ampersand_use.patch: + - change from svn to fix an uri building issue + * debian/patches/92_from_svn_select_correct_email.patch: + - change from svn to select the right emails when several are available + for a contact (lp: #195580) + * debian/patches/93_from_svn_correct_icon_use.patch: + - change from svn to fix an icon not being displayed due to wrong glade use + + -- Sebastien Bacher Wed, 17 Sep 2008 16:02:31 +0200 + nautilus-sendto (0.13.2-0ubuntu2) hardy-proposed; urgency=low * debian/patches/90_from_svn_use_correct_email.patch: only in patch2: unchanged: --- nautilus-sendto-0.13.2.orig/debian/patches/93_from_svn_correct_icon_use.patch +++ nautilus-sendto-0.13.2/debian/patches/93_from_svn_correct_icon_use.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-sendto-0.13.2/src/nautilus-sendto.glade nautilus-sendto-0.13.2.new/src/nautilus-sendto.glade +--- nautilus-sendto-0.13.2/src/nautilus-sendto.glade 2008-02-01 11:11:37.000000000 +0100 ++++ nautilus-sendto-0.13.2.new/src/nautilus-sendto.glade 2008-09-17 16:13:54.000000000 +0200 +@@ -77,7 +77,7 @@ + + + True +- document-send ++ document-send + 4 + 0.5 + 0.5 only in patch2: unchanged: --- nautilus-sendto-0.13.2.orig/debian/patches/91_from_svn_fix_ampersand_use.patch +++ nautilus-sendto-0.13.2/debian/patches/91_from_svn_fix_ampersand_use.patch @@ -0,0 +1,21 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-sendto-0.13.2/src/nautilus-sendto-command.c nautilus-sendto-0.13.2.new/src/nautilus-sendto-command.c +--- nautilus-sendto-0.13.2/src/nautilus-sendto-command.c 2008-01-20 14:54:22.000000000 +0100 ++++ nautilus-sendto-0.13.2.new/src/nautilus-sendto-command.c 2008-09-17 16:02:10.000000000 +0200 +@@ -669,8 +669,15 @@ + filename = filenames[i]; + + if (g_str_has_prefix (filename, "file://")) { +- file_list = g_list_prepend (file_list, +- g_strdup (filename)); ++ char *escaped; ++ ++ /* Make sure URIs don't contain ampersands */ ++ escaped = escape_ampersands (filename); ++ if (escaped == NULL) ++ file_list = g_list_prepend (file_list, ++ g_strdup (filename)); ++ else ++ file_list = g_list_prepend (file_list, escaped); + path = g_filename_from_uri (filename, NULL, NULL); + if (path != NULL + && g_file_test (path, G_FILE_TEST_IS_DIR)) { only in patch2: unchanged: --- nautilus-sendto-0.13.2.orig/debian/patches/92_from_svn_select_correct_email.patch +++ nautilus-sendto-0.13.2/debian/patches/92_from_svn_select_correct_email.patch @@ -0,0 +1,21 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-sendto-0.13.2/src/plugins/evolution.c nautilus-sendto-0.13.2.new/src/plugins/evolution.c +--- nautilus-sendto-0.13.2/src/plugins/evolution.c 2008-09-17 16:02:23.000000000 +0200 ++++ nautilus-sendto-0.13.2.new/src/plugins/evolution.c 2008-09-17 16:02:25.000000000 +0200 +@@ -74,7 +74,16 @@ + { + char *text; + +- email = e_contact_get (contact, E_CONTACT_EMAIL_1); ++ g_free (email); ++ email = NULL; ++ ++ if (identifier != NULL) ++ email = g_strdup (identifier); ++ else ++ email = e_contact_get (contact, E_CONTACT_EMAIL_1); ++ ++ g_free (name); ++ name = NULL; + + name = e_contact_get (contact, E_CONTACT_FULL_NAME); + if (name == NULL) {