forked from pool/seahorse
141 lines
4.7 KiB
Diff
141 lines
4.7 KiB
Diff
Index: seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
|
|
===================================================================
|
|
--- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-files.c
|
|
+++ seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
|
|
@@ -23,8 +23,10 @@
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <stdlib.h>
|
|
-#include <libintl.h>
|
|
+#include <string.h>
|
|
+#include <libintl.h>
|
|
|
|
+#include <glib.h>
|
|
#include <gnome.h>
|
|
#include <libgnomevfs/gnome-vfs.h>
|
|
|
|
@@ -366,7 +368,7 @@ prepare_dialog (FilesCtx *ctx, guint nfo
|
|
GtkWidget *combo;
|
|
gchar *msg;
|
|
gboolean sep;
|
|
- gint sel, i;
|
|
+ gint i;
|
|
GtkCellRenderer *cell;
|
|
GtkTreeModel *store;
|
|
FRFileType *save_type_list;
|
|
@@ -428,9 +430,11 @@ prepare_dialog (FilesCtx *ctx, guint nfo
|
|
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
|
|
}
|
|
|
|
- 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-2.20/libseahorse/seahorse-ssh-operation.c
|
|
===================================================================
|
|
--- seahorse-2.20.orig/libseahorse/seahorse-ssh-operation.c
|
|
+++ seahorse-2.20/libseahorse/seahorse-ssh-operation.c
|
|
@@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske
|
|
const gchar *id;
|
|
gchar *display;
|
|
|
|
- g_assert (id != NULL);
|
|
+ g_assert ((skey != NULL) && (pass != NULL));
|
|
+
|
|
id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
|
|
+ g_assert (id != NULL);
|
|
+
|
|
display = seahorse_key_get_display_name (skey);
|
|
|
|
attributes = gnome_keyring_attribute_list_new ();
|
|
Index: seahorse-2.20/src/seahorse-pgp-generate.c
|
|
===================================================================
|
|
--- seahorse-2.20.orig/src/seahorse-pgp-generate.c
|
|
+++ seahorse-2.20/src/seahorse-pgp-generate.c
|
|
@@ -65,7 +65,6 @@ on_response (GtkDialog *dialog, guint re
|
|
const gchar *email;
|
|
const gchar *comment;
|
|
const gchar *pass;
|
|
- const gchar *t;
|
|
gpgme_error_t gerr;
|
|
gint sel;
|
|
guint type;
|
|
@@ -114,7 +113,7 @@ on_response (GtkDialog *dialog, guint re
|
|
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: seahorse-2.20/libseahorse/seahorse-combo-keys.c
|
|
===================================================================
|
|
--- seahorse-2.20.orig/libseahorse/seahorse-combo-keys.c
|
|
+++ seahorse-2.20/libseahorse/seahorse-combo-keys.c
|
|
@@ -68,7 +68,7 @@ key_changed (SeahorseKeyset *skset, Seah
|
|
gchar *userid;
|
|
gpointer pntr;
|
|
SeahorseKey *skeyfrommodel;
|
|
-
|
|
+
|
|
g_return_if_fail (skey != NULL);
|
|
|
|
model = gtk_combo_box_get_model (combo);
|
|
@@ -76,7 +76,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);
|
|
@@ -104,15 +104,17 @@ key_removed (SeahorseKeyset *skset, Seah
|
|
gpointer pntr;
|
|
gboolean valid;
|
|
SeahorseKey *skeyfrommodel;
|
|
-
|
|
+
|
|
g_return_if_fail (skey != NULL);
|
|
g_return_if_fail (combo != NULL);
|
|
|
|
+ valid = gtk_tree_model_get_iter_first (model, &iter);
|
|
+
|
|
model = gtk_combo_box_get_model (combo);
|
|
|
|
while (valid) {
|
|
gtk_tree_model_get (model, &iter,
|
|
- COMBO_POINTER, pntr,
|
|
+ COMBO_POINTER, &pntr,
|
|
-1);
|
|
|
|
skeyfrommodel = SEAHORSE_KEY (pntr);
|
|
Index: seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c
|
|
===================================================================
|
|
--- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-progress.c
|
|
+++ seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c
|
|
@@ -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 @@ seahorse_tool_progress_update (gdouble f
|
|
gchar *msg;
|
|
|
|
if (message != NULL)
|
|
- msg = gnome_vfs_unescape_string (message);
|
|
+ msg = gnome_vfs_unescape_string (message, NULL);
|
|
else
|
|
msg = g_strdup ("");
|
|
|