[libcryptui] Bump dependency versions, and fix for some deprecations
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libcryptui] Bump dependency versions, and fix for some deprecations
- Date: Mon, 9 Jul 2012 09:46:02 +0000 (UTC)
commit 5e15de8fff97e0576477f5d58587d3a9c4464a35
Author: Stef Walter <stefw gnome org>
Date: Mon Jul 9 11:44:37 2012 +0200
Bump dependency versions, and fix for some deprecations
configure.ac | 5 +++--
daemon/seahorse-daemon.c | 2 --
libcryptui/cryptui-key-chooser.c | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a95d177..68b623e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,13 +42,14 @@ AC_CHECK_FUNCS(strsep)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-GTK_REQUIRED=2.90.0
+GTK_REQUIRED=3.0.0
+GLIB_REQUIRED=2.32.0
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 >= $GLIB_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
PKG_CHECK_MODULES(SM, sm ice)
diff --git a/daemon/seahorse-daemon.c b/daemon/seahorse-daemon.c
index b15edb1..88a02ca 100644
--- a/daemon/seahorse-daemon.c
+++ b/daemon/seahorse-daemon.c
@@ -228,8 +228,6 @@ int main(int argc, char* argv[])
GOptionContext *octx = NULL;
GError *error = NULL;
- g_thread_init (NULL);
-
seahorse_secure_memory_init ();
octx = g_option_context_new ("");
diff --git a/libcryptui/cryptui-key-chooser.c b/libcryptui/cryptui-key-chooser.c
index 7c98607..96d808f 100644
--- a/libcryptui/cryptui-key-chooser.c
+++ b/libcryptui/cryptui-key-chooser.c
@@ -145,8 +145,8 @@ construct_recipients (CryptUIKeyChooser *chooser, GtkBox *box)
GtkWidget *hbox;
/* Top filter box */
- hbox = gtk_hbox_new (FALSE, 12);
-
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
/* Filter Combo */
chooser->priv->filtermode = GTK_COMBO_BOX (gtk_combo_box_text_new ());
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (chooser->priv->filtermode), _("All Keys"));
@@ -252,8 +252,8 @@ construct_signer (CryptUIKeyChooser *chooser, GtkBox *box)
g_list_free (keys);
} else if (count > 1) {
/* Top filter box */
- hbox = gtk_hbox_new (FALSE, 12);
-
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
/* Sign Label */
label = gtk_label_new (_("_Sign message as:"));
gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]