Mercurial > pidgin.yaz
comparison pidgin/gtkprefs.c @ 26817:3912f55a1633
propagate from branch 'im.pidgin.pidgin' (head fbb4fe5da444943eecc76bdcd6c8ba967790b6c8)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 601bc627c9430320848361f0ed81c6c4c6ee53e0)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 28 Apr 2009 18:43:57 +0000 |
parents | 38a5df43d525 |
children | 85a4c248f751 f3ccb5a36fd6 |
comparison
equal
deleted
inserted
replaced
26743:de9816c970fe | 26817:3912f55a1633 |
---|---|
636 | 636 |
637 gtk_list_store_append(prefs_sound_themes, &iter); | 637 gtk_list_store_append(prefs_sound_themes, &iter); |
638 gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, purple_theme_get_name(theme), -1); | 638 gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, purple_theme_get_name(theme), -1); |
639 | 639 |
640 if (pixbuf != NULL) | 640 if (pixbuf != NULL) |
641 gdk_pixbuf_unref(pixbuf); | 641 g_object_unref(G_OBJECT(pixbuf)); |
642 | 642 |
643 } else if (PIDGIN_IS_BLIST_THEME(theme) || PIDGIN_IS_STATUS_ICON_THEME(theme)){ | 643 } else if (PIDGIN_IS_BLIST_THEME(theme) || PIDGIN_IS_STATUS_ICON_THEME(theme)){ |
644 GtkListStore *store; | 644 GtkListStore *store; |
645 | 645 |
646 if (PIDGIN_IS_BLIST_THEME(theme)) | 646 if (PIDGIN_IS_BLIST_THEME(theme)) |
663 gtk_list_store_append(store, &iter); | 663 gtk_list_store_append(store, &iter); |
664 gtk_list_store_set(store, &iter, 0, pixbuf, 1, markup, 2, name, -1); | 664 gtk_list_store_set(store, &iter, 0, pixbuf, 1, markup, 2, name, -1); |
665 | 665 |
666 g_free(markup); | 666 g_free(markup); |
667 if (pixbuf != NULL) | 667 if (pixbuf != NULL) |
668 gdk_pixbuf_unref(pixbuf); | 668 g_object_unref(G_OBJECT(pixbuf)); |
669 } | 669 } |
670 | 670 |
671 } | 671 } |
672 | 672 |
673 /* init all the theme variables so that the themes can be sorted later and used by pref pages */ | 673 /* init all the theme variables so that the themes can be sorted later and used by pref pages */ |
700 | 700 |
701 gtk_list_store_append(prefs_status_icon_themes, &iter); | 701 gtk_list_store_append(prefs_status_icon_themes, &iter); |
702 gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, "<b>(Default)</b> - None\n<span color='dim grey'>" | 702 gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, "<b>(Default)</b> - None\n<span color='dim grey'>" |
703 "The default Pidgin status icon theme</span>", 2, "", -1); | 703 "The default Pidgin status icon theme</span>", 2, "", -1); |
704 | 704 |
705 gdk_pixbuf_unref(pixbuf); | 705 g_object_unref(G_OBJECT(pixbuf)); |
706 } | 706 } |
707 | 707 |
708 /* builds a theme combo box from a list store with colums: icon preview, markup, theme name */ | 708 /* builds a theme combo box from a list store with colums: icon preview, markup, theme name */ |
709 static GtkWidget * | 709 static GtkWidget * |
710 prefs_build_theme_combo_box(GtkListStore *store, const gchar *current_theme) | 710 prefs_build_theme_combo_box(GtkListStore *store, const gchar *current_theme) |