86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
Index: seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c
|
|
===================================================================
|
|
--- seahorse-1.0.1.orig/plugins/nautilus/seahorse-tool-files.c
|
|
+++ seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c
|
|
@@ -23,8 +23,10 @@
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <stdlib.h>
|
|
+#include <string.h>
|
|
#include <libintl.h>
|
|
|
|
+#include <glib.h>
|
|
#include <gnome.h>
|
|
#include <libgnomevfs/gnome-vfs.h>
|
|
|
|
@@ -236,9 +238,11 @@ prepare_dialog (FilesCtx *ctx, guint nfo
|
|
pkg = seahorse_util_uri_split_last (pkguri);
|
|
gtk_entry_set_text (GTK_ENTRY (w), pkg);
|
|
|
|
- if(sep) {
|
|
+ if (sep) {
|
|
gtk_widget_grab_focus (w);
|
|
- gtk_editable_select_region (GTK_EDITABLE (w), 0, sel);
|
|
+ /* Is this TRT? */
|
|
+ /* 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: seahorse-1.0.1/libseahorse/seahorse-ssh-operation.c
|
|
===================================================================
|
|
--- seahorse-1.0.1.orig/libseahorse/seahorse-ssh-operation.c
|
|
+++ seahorse-1.0.1/libseahorse/seahorse-ssh-operation.c
|
|
@@ -994,7 +994,10 @@ set_keyring_passphrase (SeahorseKey *ske
|
|
const gchar *id;
|
|
gchar *display;
|
|
|
|
- g_assert (id != NULL);
|
|
+ /* Uhh? */
|
|
+ /* g_assert (id != NULL); */
|
|
+ g_assert ((skey != NULL) && (pass != NULL));
|
|
+
|
|
id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
|
|
display = seahorse_key_get_display_name (skey);
|
|
|
|
Index: seahorse-1.0.1/src/seahorse-pgp-generate.c
|
|
===================================================================
|
|
--- seahorse-1.0.1.orig/src/seahorse-pgp-generate.c
|
|
+++ seahorse-1.0.1/src/seahorse-pgp-generate.c
|
|
@@ -65,7 +65,8 @@ on_response (GtkDialog *dialog, guint re
|
|
const gchar *email;
|
|
const gchar *comment;
|
|
const gchar *pass;
|
|
- const gchar *t;
|
|
+ /* got to call it something, i guess. */
|
|
+ const gchar *t = "gpg/pgp";
|
|
gpgme_error_t gerr;
|
|
gint sel;
|
|
guint type;
|
|
Index: seahorse-1.0.1/libseahorse/seahorse-default-key-control.c
|
|
===================================================================
|
|
--- seahorse-1.0.1.orig/libseahorse/seahorse-default-key-control.c
|
|
+++ seahorse-1.0.1/libseahorse/seahorse-default-key-control.c
|
|
@@ -78,7 +78,7 @@ key_changed (SeahorseKeyset *skset, Seah
|
|
|
|
while (valid) {
|
|
gtk_tree_model_get (model, &iter,
|
|
- COMBO_POINTER, pntr,
|
|
+ COMBO_POINTER, &pntr,
|
|
-1);
|
|
|
|
skeyfrommodel = SEAHORSE_KEY (pntr);
|
|
@@ -111,10 +111,11 @@ key_removed (SeahorseKeyset *skset, Seah
|
|
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);
|