Mercurial > pidgin
changeset 32608:ebe1baa9522c
disapproval of revision 'fe9c6c6158b441811aceea190650f189fe1fa4c3'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 19 Feb 2010 07:21:14 +0000 |
| parents | 81e2c00c3e69 |
| children | 47636f9ad624 |
| files | pidgin/gtkutils.c |
| diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Tue Feb 16 08:29:28 2010 +0000 +++ b/pidgin/gtkutils.c Fri Feb 19 07:21:14 2010 +0000 @@ -406,13 +406,13 @@ 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 -#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 @@ 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; }