Mercurial > pidgin
changeset 27175:afcb1d41e557
Abstract an "image loading function" (will be used for the tooltip in a sec)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 25 Jun 2009 03:10:46 +0000 |
| parents | 708f92703a13 |
| children | 4c4c747112e0 552b5292f36f |
| files | pidgin/plugins/disco/gtkdisco.c |
| diffstat | 1 files changed, 29 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/disco/gtkdisco.c Thu Jun 25 02:53:26 2009 +0000 +++ b/pidgin/plugins/disco/gtkdisco.c Thu Jun 25 03:10:46 2009 +0000 @@ -108,6 +108,34 @@ } } +static GdkPixbuf * +pidgin_disco_load_icon(XmppDiscoService *service, const char *size) +{ + GdkPixbuf *pixbuf = NULL; + char *filename; + + g_return_val_if_fail(service != NULL, NULL); + g_return_val_if_fail(size != NULL, NULL); + + if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) { + char *tmp = g_strconcat(service->gateway_type, ".png", NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL); + g_free(tmp); +#if 0 + } else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) { + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL); +#endif + } else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT) + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL); + + if (filename) { + pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + g_free(filename); + } + + return pixbuf; +} + static void pidgin_disco_create_tree(PidginDiscoList *pdl); static void dialog_select_account_cb(GObject *w, PurpleAccount *account, @@ -667,7 +695,6 @@ { PidginDiscoDialog *dialog; GtkTreeIter iter, parent_iter, child; - char *filename = NULL; GdkPixbuf *pixbuf = NULL; gboolean append = TRUE; @@ -725,21 +752,7 @@ gtk_tree_path_free(path); } - if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) { - char *tmp = g_strconcat(service->gateway_type, ".png", NULL); - filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", "16", tmp, NULL); - g_free(tmp); -#if 0 - } else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) { - filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "16", "person.png", NULL); -#endif - } else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT) - filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "16", "chat.png", NULL); - - if (filename) { - pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - g_free(filename); - } + pixbuf = pidgin_disco_load_icon(service, "16"); gtk_tree_store_set(pdl->model, &iter, PIXBUF_COLUMN, pixbuf,