/pidgin/main: a7f503e12c8b: Remove extra version checks.

Elliott Sales de Andrade qulogic at pidgin.im
Tue Jul 24 04:03:59 EDT 2012


Changeset: a7f503e12c8b60b65f59665236fd9689553fd42c
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-07-24 02:41 -0400
Branch:	 cpw.qulogic.gtk3-required
URL: http://hg.pidgin.im/pidgin/main/rev/a7f503e12c8b

Description:

Remove extra version checks.

diffstat:

 pidgin/gtkimhtmltoolbar.c |  12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diffs (39 lines):

diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -678,11 +678,7 @@
 	g_object_set_data(G_OBJECT(button), "smiley_text", face);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(insert_smiley_text), toolbar);
 
-#if GTK_CHECK_VERSION(2,12,0)
 	gtk_widget_set_tooltip_text(button, face);
-#else
-	gtk_tooltips_set_tip(toolbar->tooltips, button, face, NULL);
-#endif
 
 	/* these look really weird with borders */
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@@ -696,11 +692,7 @@
 		g_snprintf(tip, sizeof(tip),
 			_("This smiley is disabled because a custom smiley exists for this shortcut:\n %s"),
 			face);
-#if GTK_CHECK_VERSION(2,12,0)
 		gtk_widget_set_tooltip_text(button, tip);
-#else
-		gtk_tooltips_set_tip(toolbar->tooltips, button, tip, NULL);
-#endif
 		gtk_widget_set_sensitive(button, FALSE);
 	} else if (psmiley) {
 		/* Remove the button if the smiley is destroyed */
@@ -1285,11 +1277,7 @@
 			g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(buttons[iter].callback), toolbar);
 			*(buttons[iter].button) = button;
-#if GTK_CHECK_VERSION(2,12,0)
 			gtk_widget_set_tooltip_text(button, buttons[iter].tooltip);
-#else
-			gtk_tooltips_set_tip(toolbar->tooltips, button, buttons[iter].tooltip, NULL);
-#endif
 		} else
 			button = gtk_vseparator_new();
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);



More information about the Commits mailing list