r12631 - in /desktop/unstable/seahorse/debian: changelog patches/00list patches/20_svn_fix_pointer_usage.dpatch patches/21_svn_missing_include.dpatch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Sep 20 18:31:52 UTC 2007
Author: slomo
Date: Thu Sep 20 18:31:52 2007
New Revision: 12631
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12631
Log:
* debian/patches/20_svn_fix_pointer_usage.dpatch:
+ Fix some broken pointer handling. Patch taken from SVN.
* debian/patches/21_svn_missing_include.dpatch:
+ Add a missing include and call gnome_vfs_unescape_string correctly.
This fixes an implicit pointer conversion that will break on archs
where sizeof(void*)>sizeof(int). Patch taken from SVN (Closes: #443255).
Added:
desktop/unstable/seahorse/debian/patches/20_svn_fix_pointer_usage.dpatch
desktop/unstable/seahorse/debian/patches/21_svn_missing_include.dpatch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/patches/00list
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=12631&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Thu Sep 20 18:31:52 2007
@@ -1,3 +1,14 @@
+seahorse (2.20-2) unstable; urgency=low
+
+ * debian/patches/20_svn_fix_pointer_usage.dpatch:
+ + Fix some broken pointer handling. Patch taken from SVN.
+ * debian/patches/21_svn_missing_include.dpatch:
+ + Add a missing include and call gnome_vfs_unescape_string correctly.
+ This fixes an implicit pointer conversion that will break on archs
+ where sizeof(void*)>sizeof(int). Patch taken from SVN (Closes: #443255).
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 20 Sep 2007 20:30:07 +0200
+
seahorse (2.20-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/seahorse/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/00list?rev=12631&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (original)
+++ desktop/unstable/seahorse/debian/patches/00list Thu Sep 20 18:31:52 2007
@@ -1,3 +1,5 @@
2_mlock.dpatch
8_force_ssh.dpatch
10_relibtoolize.dpatch
+20_svn_fix_pointer_usage.dpatch
+21_svn_missing_include.dpatch
Added: desktop/unstable/seahorse/debian/patches/20_svn_fix_pointer_usage.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/20_svn_fix_pointer_usage.dpatch?rev=12631&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/20_svn_fix_pointer_usage.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/20_svn_fix_pointer_usage.dpatch Thu Sep 20 18:31:52 2007
@@ -1,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+Index: src/seahorse-pgp-generate.c
+===================================================================
+--- src/seahorse-pgp-generate.c (Revision 1948)
++++ src/seahorse-pgp-generate.c (Revision 1949)
+@@ -65,7 +65,6 @@
+ const gchar *email;
+ const gchar *comment;
+ const gchar *pass;
+- const gchar *t;
+ gpgme_error_t gerr;
+ gint sel;
+ guint type;
+@@ -114,7 +113,7 @@
+ g_return_if_fail (widget != NULL);
+ bits = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+ if (bits < 512 || bits > 8192) {
+- g_message ("invalid key size: %s defaulting to 2048", t);
++ g_message ("invalid key size: %s defaulting to 2048", available_algorithms[sel].desc);
+ bits = 2048;
+ }
+
+Index: plugins/nautilus/seahorse-tool-files.c
+===================================================================
+--- plugins/nautilus/seahorse-tool-files.c (Revision 1948)
++++ plugins/nautilus/seahorse-tool-files.c (Revision 1949)
+@@ -366,7 +366,7 @@
+ GtkWidget *combo;
+ gchar *msg;
+ gboolean sep;
+- gint sel, i;
++ gint i;
+ GtkCellRenderer *cell;
+ GtkTreeModel *store;
+ FRFileType *save_type_list;
+@@ -407,7 +407,6 @@
+ combo = glade_xml_get_widget (swidget->xml, "package-extension");
+ store = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (combo), store);
+- fprintf(stderr, "Model added\n");
+ g_object_unref (store);
+
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
+@@ -428,9 +427,9 @@
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
+ }
+
+- if(sep) {
++ if(sep == FALSE) {
+ gtk_widget_grab_focus (w);
+- gtk_editable_select_region (GTK_EDITABLE (w), 0, sel);
++ gtk_editable_select_region (GTK_EDITABLE (w), 0, strlen (pkg));
+ }
+
+ /* Setup the main radio buttons */
+Index: libseahorse/seahorse-ssh-operation.c
+===================================================================
+--- libseahorse/seahorse-ssh-operation.c (Revision 1948)
++++ libseahorse/seahorse-ssh-operation.c (Revision 1949)
+@@ -994,8 +994,10 @@
+ const gchar *id;
+ gchar *display;
+
++ g_assert ((skey != NULL) && (pass != NULL));
++
++ id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
+ g_assert (id != NULL);
+- id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
+ display = seahorse_key_get_display_name (skey);
+
+ attributes = gnome_keyring_attribute_list_new ();
+Index: libseahorse/seahorse-combo-keys.c
+===================================================================
+--- libseahorse/seahorse-combo-keys.c (Revision 1948)
++++ libseahorse/seahorse-combo-keys.c (Revision 1949)
+@@ -76,7 +76,7 @@
+
+ while (valid) {
+ gtk_tree_model_get (model, &iter,
+- COMBO_POINTER, pntr,
++ COMBO_POINTER, &pntr,
+ -1);
+
+ skeyfrommodel = SEAHORSE_KEY (pntr);
+@@ -109,10 +109,11 @@
+ g_return_if_fail (combo != NULL);
+
+ model = gtk_combo_box_get_model (combo);
++ valid = gtk_tree_model_get_iter_first (model, &iter);
+
+ while (valid) {
+ gtk_tree_model_get (model, &iter,
+- COMBO_POINTER, pntr,
++ COMBO_POINTER, &pntr,
+ -1);
+
+ skeyfrommodel = SEAHORSE_KEY (pntr);
Added: desktop/unstable/seahorse/debian/patches/21_svn_missing_include.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/21_svn_missing_include.dpatch?rev=12631&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/21_svn_missing_include.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/21_svn_missing_include.dpatch Thu Sep 20 18:31:52 2007
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+Index: plugins/nautilus/seahorse-tool-progress.c
+===================================================================
+--- plugins/nautilus/seahorse-tool-progress.c (Revision 1946)
++++ plugins/nautilus/seahorse-tool-progress.c (Revision 1947)
+@@ -24,6 +24,7 @@
+ #include <signal.h>
+
+ #include <gnome.h>
++#include <libgnomevfs/gnome-vfs.h>
+
+ #include "seahorse-gtkstock.h"
+ #include "seahorse-util.h"
+@@ -274,7 +275,7 @@
+ gchar *msg;
+
+ if (message != NULL)
+- msg = gnome_vfs_unescape_string (message);
++ msg = gnome_vfs_unescape_string (message, NULL);
+ else
+ msg = g_strdup ("");
+
More information about the pkg-gnome-commits
mailing list