/pidgin/main: cdde8099c4f0: Fix two gtk3 warnings

Tomasz Wasilczyk twasilczyk at pidgin.im
Sat Mar 22 06:58:28 EDT 2014


Changeset: cdde8099c4f0a3e5bc4e4495a0d0e0e5f7da7ae2
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-22 11:58 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/cdde8099c4f0

Description:

Fix two gtk3 warnings

diffstat:

 pidgin/gtkblist.c |  2 ++
 pidgin/gtkprefs.c |  2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -5921,7 +5921,9 @@ static void pidgin_blist_show(PurpleBudd
 	GError *error;
 	GtkAccelGroup *accel_group;
 	GtkTreeSelection *selection;
+#if ! GTK_CHECK_VERSION(3,0,0)
 	int blist_width;
+#endif
 	GtkTargetEntry dte[] = {{"PURPLE_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD },
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -561,7 +561,7 @@ delete_prefs(GtkWidget *asdf, void *gdsa
 
 	sample_webview = NULL;
 
-#if USE_VV
+#ifdef USE_VV
 	voice_level = NULL;
 	voice_threshold = NULL;
 	voice_volume = NULL;



More information about the Commits mailing list