cpw.qulogic.gtk3: 29d982e5: disapproval of revision 'fe9c6c6158b4418...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 29d982e541ea6b39a87464070e556a7ff5e9e8e4
Ancestor: fe9c6c6158b441811aceea190650f189fe1fa4c3
Author: qulogic at pidgin.im
Date: 2010-02-19T07:21:14
Branch: im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/29d982e541ea6b39a87464070e556a7ff5e9e8e4

Modified files:
        pidgin/gtkutils.c

ChangeLog: 

disapproval of revision 'fe9c6c6158b441811aceea190650f189fe1fa4c3'
-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	5b629048a24d23b43a51b5c45572c29550ce708a
+++ pidgin/gtkutils.c	f2249c34c76983c63795b3b0109b20e57db1bcf7
@@ -406,13 +406,13 @@ pidgin_pixbuf_button_from_stock(const ch
 	gtk_container_add(GTK_CONTAINER(button), bbox);
 
 	if (icon) {
-		gtk_box_pack_start(GTK_BOX(bbox), ibox, TRUE, TRUE, 0);
+		gtk_box_pack_start_defaults(GTK_BOX(bbox), ibox);
 		image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
 		gtk_box_pack_end(GTK_BOX(ibox), image, FALSE, TRUE, 0);
 	}
 
 	if (text) {
-		gtk_box_pack_start(GTK_BOX(bbox), lbox, TRUE, TRUE, 0);
+		gtk_box_pack_start_defaults(GTK_BOX(bbox), lbox);
 		label = gtk_label_new(NULL);
 		gtk_label_set_text_with_mnemonic(GTK_LABEL(label), text);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
@@ -892,11 +892,7 @@ gboolean
 }
 
 gboolean
-#if GTK_CHECK_VERSION(2,4,0)
-pidgin_check_if_dir(const char *path, gpointer filesel)
-#else
 pidgin_check_if_dir(const char *path, GtkFileSelection *filesel)
-#endif
 {
 	char *dirname = NULL;
 
@@ -905,9 +901,7 @@ pidgin_check_if_dir(const char *path, Gt
 		if (path[strlen(path) - 1] != G_DIR_SEPARATOR) {
 			dirname = g_strconcat(path, G_DIR_SEPARATOR_S, NULL);
 		}
-#if !GTK_CHECK_VERSION(2,4,0)
 		gtk_file_selection_set_filename(filesel, (dirname != NULL) ? dirname : path);
-#endif
 		g_free(dirname);
 		return TRUE;
 	}