Mercurial > pidgin
changeset 32605:81e2c00c3e69
Remove some deprecated functions.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 16 Feb 2010 08:29:28 +0000 |
| parents | 41982cac439f |
| children | c8ccf2f94451 ebe1baa9522c |
| files | pidgin/gtkutils.c |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Tue Feb 16 08:21:11 2010 +0000 +++ b/pidgin/gtkutils.c Tue Feb 16 08:29:28 2010 +0000 @@ -406,13 +406,13 @@ gtk_container_add(GTK_CONTAINER(button), bbox); if (icon) { - gtk_box_pack_start_defaults(GTK_BOX(bbox), ibox); + gtk_box_pack_start(GTK_BOX(bbox), ibox, TRUE, TRUE, 0); 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_defaults(GTK_BOX(bbox), lbox); + gtk_box_pack_start(GTK_BOX(bbox), lbox, TRUE, TRUE, 0); 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,7 +892,11 @@ } 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; @@ -901,7 +905,9 @@ 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; }