pool/seahorse
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=14

Browse Source
This commit is contained in:
OBS User unknown 2007-12-17 11:06:19 +00:00 committed by Git OBS Bridge
parent 8b9728b9d6
commit 5c060d394e
5 changed files with 24 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
seahorse-2.20.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
size 2287702

3
seahorse-2.20.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5216a1d9a6592b4fe253fb85236f862cd34f4b0d04ab70c23288a7e4b100548b
size 2055434

166
seahorse-abuild-warnings.patch
View File

@ -1,166 +0,0 @@
diff -r 2b79a27fbfe7 libseahorse/seahorse-combo-keys.c
--- a/libseahorse/seahorse-combo-keys.c Wed Nov 21 15:07:02 2007 +0000
+++ b/libseahorse/seahorse-combo-keys.c Wed Nov 21 15:08:03 2007 +0000
@@ -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,16 @@ key_removed (SeahorseKeyset *skset, Seah
gpointer pntr;
gboolean valid;
SeahorseKey *skeyfrommodel;
-
+
g_return_if_fail (skey != NULL);
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);
diff -r 2b79a27fbfe7 libseahorse/seahorse-ssh-key-data.c
--- a/libseahorse/seahorse-ssh-key-data.c Wed Nov 21 15:07:02 2007 +0000
+++ b/libseahorse/seahorse-ssh-key-data.c Wed Nov 21 15:08:03 2007 +0000
@@ -79,18 +79,23 @@ parse_key_blob (guchar *bytes, gsize len
{
md5_ctx_t ctx;
guchar digest[MD5_LEN];
- gchar *fingerprint;
+ gchar *fingerprint, *fingerprint_tmp;
guint i;
seahorse_md5_init (&ctx);
seahorse_md5_update (&ctx, bytes, len);
seahorse_md5_final (digest, &ctx);
- fingerprint = g_new0 (gchar, MD5_LEN * 3 + 1);
+ /* I think this is better. */
+ fingerprint = g_strdup("");
for (i = 0; i < MD5_LEN; i++) {
- char hex[4];
- snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i]));
- strncat (fingerprint, hex, MD5_LEN * 3 + 1);
+ char *hex;
+ hex = g_strdup_printf("%02x:", (int) (digest[i]));
+ fingerprint_tmp = fingerprint;
+ fingerprint = g_strconcat (fingerprint_tmp, hex, NULL);
+
+ g_free (fingerprint_tmp);
+ g_free (hex);
}
/* Remove the trailing ':' character */
diff -r 2b79a27fbfe7 libseahorse/seahorse-ssh-operation.c
--- a/libseahorse/seahorse-ssh-operation.c Wed Nov 21 15:07:02 2007 +0000
+++ b/libseahorse/seahorse-ssh-operation.c Wed Nov 21 15:08:03 2007 +0000
@@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske
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 ();
diff -r 2b79a27fbfe7 plugins/nautilus/seahorse-tool-files.c
--- a/plugins/nautilus/seahorse-tool-files.c Wed Nov 21 15:07:02 2007 +0000
+++ b/plugins/nautilus/seahorse-tool-files.c Wed Nov 21 15:08:03 2007 +0000
@@ -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 */
diff -r 2b79a27fbfe7 plugins/nautilus/seahorse-tool-progress.c
--- a/plugins/nautilus/seahorse-tool-progress.c Wed Nov 21 15:07:02 2007 +0000
+++ b/plugins/nautilus/seahorse-tool-progress.c Wed Nov 21 15:08:03 2007 +0000
@@ -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 ("");
diff -r 2b79a27fbfe7 src/seahorse-pgp-generate.c
--- a/src/seahorse-pgp-generate.c Wed Nov 21 15:07:02 2007 +0000
+++ b/src/seahorse-pgp-generate.c Wed Nov 21 15:08:03 2007 +0000
@@ -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;
}

10
seahorse.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Dec 14 20:27:26 CET 2007 - jpr@suse.de
- Update to 2.20.1
* Fix selection of archive names when encrypting.
* Now works with Gedit 2.20
* Other UI and code fixes
- Remove upstreamed patch seahourse-abuild-warnings.patch
- Annotate seahourse-desktop.patch
-------------------------------------------------------------------
Wed Dec 5 01:22:56 CET 2007 - maw@suse.de

17
seahorse.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package seahorse (Version 2.20)
# spec file for package seahorse (Version 2.20.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -16,15 +16,14 @@ License: GPL v2 or later
Group: System/GUI/GNOME
AutoReqProv: on
PreReq: gconf2
Version: 2.20
Release: 37
Version: 2.20.1
Release: 1
Requires: %{name}-lang = %{version}
Summary: GNOME2 interface for gnupg
Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
Patch0: %{name}-gpgme-version.patch
# PATCH-FIX-UPSTREAM seahorse-abuild-warnings.patch bgo503648
Patch1: seahorse-desktop.patch
# PATCH-FIX-UPSTREAM seahorse-abuild-warnings.patch
Patch2: seahorse-abuild-warnings.patch
Url: http://seahorse.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@ -66,7 +65,6 @@ Authors:
%setup
%patch0
%patch1 -p1
%patch2 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@ -158,6 +156,13 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libcryptui/*.h
%changelog
* Fri Dec 14 2007 - jpr@suse.de
- Update to 2.20.1
* Fix selection of archive names when encrypting.
* Now works with Gedit 2.20
* Other UI and code fixes
- Remove upstreamed patch seahourse-abuild-warnings.patch
- Annotate seahourse-desktop.patch
* Wed Dec 05 2007 - maw@suse.de
- Don't require openldap2 to build.
* Wed Nov 21 2007 - maw@suse.de