[Pkg-privacy-commits] [pidgin-otr] 196/255: Imported Debian patch 3.2.0-5

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 8a58e8221f925dd7f890f805f48796d73e4acad1
Author: Thibaut VARENE <varenet at debian.org>
Date:   Wed Nov 11 16:20:11 2009 +0100

    Imported Debian patch 3.2.0-5
---
 debian/changelog | 10 ++++++++++
 debian/control   |  4 ++--
 debian/rules     |  5 +++++
 gtk-dialog.c     |  6 +++++-
 otr-plugin.c     |  1 +
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a6bbd1..fbcce3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pidgin-otr (3.2.0-5) unstable; urgency=low
+
+  * Fix key generation to use /dev/urandom with more recent libgcrypt
+    versions, patch from Felix Geyer (Closes: #550375)
+  * Allow to copy the fingerprints from the authentication dialog,
+    patch from Felix Geyer (Closes: #544995) (LP: #310769)
+  * Fix outdated config.{sub,guess}
+
+ -- Thibaut VARENE <varenet at debian.org>  Wed, 11 Nov 2009 16:20:11 +0100
+
 pidgin-otr (3.2.0-4) unstable; urgency=low
 
   * update pot at build time, patch from Sebastien Bacher (Closes: #518466)
diff --git a/debian/control b/debian/control
index 974cbd9..336b1f3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: pidgin-otr
 Section: net
 Priority: optional
 Maintainer: Thibaut VARENE <varenet at debian.org>
-Build-Depends: debhelper (>= 7), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), pidgin-dev, libotr2-dev (>= 3.1.0), libxml-parser-perl, intltool
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), pidgin-dev, libotr2-dev (>= 3.1.0), libxml-parser-perl, intltool, autotools-dev
+Standards-Version: 3.8.3
 
 Package: pidgin-otr
 Architecture: any
diff --git a/debian/rules b/debian/rules
index e7d059b..ae974bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,11 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
+	rm -f config.cache
+
 	# Add here commands to configure the package.
 	./configure --host=$(DEB_HOST_GNU_TYPE)\
 		--build=$(DEB_BUILD_GNU_TYPE)\
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 03d4602..620a1bc 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -71,6 +71,7 @@ static int img_id_unverified = 0;
 static int img_id_private = 0;
 static int img_id_finished = 0;
 
+static GtkLabel * fingerprint_label = 0;
 
 typedef struct {
     ConnContext *context;       /* The context used to fire library code */
@@ -643,11 +644,12 @@ static void add_to_vbox_verify_fingerprint(GtkWidget *vbox, ConnContext *context
     label = gtk_label_new(NULL);
     
     gtk_label_set_markup(GTK_LABEL(label), label_text);
-    gtk_label_set_selectable(GTK_LABEL(label), FALSE);
+    gtk_label_set_selectable(GTK_LABEL(label), TRUE);
     g_free(label_text);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+    fingerprint_label = label;
         
     add_vrfy_fingerprint(vbox, vfd);
     g_signal_connect(G_OBJECT(vbox), "destroy",
@@ -677,6 +679,8 @@ static void redraw_auth_vbox(GtkComboBox *combo, void *data) {
         auth_data->smppair->entry = NULL;
         gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 2);
         auth_data->smppair->smp_type = -1;
+        // workaround to prevent the text from always being selected
+        gtk_label_select_region(GTK_LABEL(fingerprint_label), 0, 0);
     }
     
 }
diff --git a/otr-plugin.c b/otr-plugin.c
index eae00c3..05281b7 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -992,6 +992,7 @@ __init_plugin(PurplePlugin *plugin)
 
 #ifndef WIN32
     /* Make key generation use /dev/urandom instead of /dev/random */
+    gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
     gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git