# HG changeset patch # User Sean Egan # Date 1169892907 0 # Node ID 29e443e0613f61ff5a38d2ea2099d4d2aa1f929c # Parent 974e8112b27e234ba43fd73c1a9077c03563a569 I think this takes care of protocol icons. Note there are still places that ask for a "stauts icon" and expect a protocol icon. I haven't hit those yet. diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Jan 27 10:15:07 2007 +0000 @@ -1563,7 +1563,7 @@ g_free(pulse_data); } - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1942,7 +1942,7 @@ gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); gtk_tree_view_column_set_resizable(column, TRUE); - /* Status Icon */ + /* Buddy Icon */ renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_add_attribute(column, renderer, @@ -1982,7 +1982,7 @@ GdkPixbuf *statusicon_pixbuf; GdkPixbuf *statusicon_pixbuf_scaled; - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1996,7 +1996,7 @@ statusicon_pixbuf = NULL; if (statusicon_pixbuf) { - statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); + statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 22, 22, GDK_INTERP_HYPER); } else { statusicon_pixbuf_scaled = NULL; } diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkblist.c Sat Jan 27 10:15:07 2007 +0000 @@ -6343,7 +6343,7 @@ gaim_account_get_protocol_name(account), ")", NULL); menuitem = gtk_image_menu_item_new_with_label(buf); g_free(buf); - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); if (pixbuf != NULL) { if (!gaim_account_is_connected(account)) diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkconv.c Sat Jan 27 10:15:07 2007 +0000 @@ -2249,7 +2249,7 @@ /* If they don't have a buddy icon, then use the PRPL icon */ if (status == NULL) - status = gaim_gtk_create_prpl_icon(account, small_icon ? 0.5 : 1.0); + status = gaim_gtk_create_prpl_icon(account, small_icon ? PIDGIN_PRPL_ICON_SMALL : PIDGIN_PRPL_ICON_LARGE); return status; } diff -r 974e8112b27e -r 29e443e0613f pidgin/gtklog.c --- a/pidgin/gtklog.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtklog.c Sat Jan 27 10:15:07 2007 +0000 @@ -503,7 +503,8 @@ } display_log_viewer(ht, gaim_log_get_logs(type, screenname, account), - title, gaim_gtk_create_prpl_icon(account, 0.5), gaim_log_get_total_size(type, screenname, account)); + title, gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM), + gaim_log_get_total_size(type, screenname, account)); g_free(title); } diff -r 974e8112b27e -r 29e443e0613f pidgin/gtknotify.c --- a/pidgin/gtknotify.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtknotify.c Sat Jan 27 10:15:07 2007 +0000 @@ -398,7 +398,7 @@ GdkPixbuf *icon; gboolean new_n = TRUE; - icon = gaim_gtk_create_prpl_icon(account, 1); + icon = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if (count > 0) { /* Allow only one non-detailed email notification for each account */ diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Jan 27 10:15:07 2007 +0000 @@ -186,7 +186,7 @@ events = gaim_pounce_get_events(pounce); - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); pouncer = gaim_account_get_username(account); pouncee = gaim_pounce_get_pouncee(pounce); diff -r 974e8112b27e -r 29e443e0613f pidgin/gtksavedstatuses.c --- a/pidgin/gtksavedstatuses.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sat Jan 27 10:15:07 2007 +0000 @@ -969,7 +969,7 @@ GdkPixbuf *pixbuf; const char *id = NULL, *name = NULL, *message = NULL; - pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); + pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); if ((pixbuf != NULL) && !gaim_account_is_connected(account)) { gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); @@ -1538,7 +1538,7 @@ continue; id = gaim_status_type_get_id(status_type); - pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, 0.5); + pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, PIDGIN_PRPL_ICON_MEDIUM); name = gaim_status_type_get_name(status_type); gtk_list_store_append(dialog->model, &iter); diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkutils.c --- a/pidgin/gtkutils.c Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkutils.c Sat Jan 27 10:15:07 2007 +0000 @@ -441,7 +441,6 @@ GtkWidget *item; GtkWidget *image; GdkPixbuf *pixbuf; - GdkPixbuf *scale; GList *p; GtkSizeGroup *sg; char *filename; @@ -478,19 +477,15 @@ proto_name = prpl_info->list_icon(NULL, NULL); g_snprintf(buf, sizeof(buf), "%s.png", proto_name); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + "16", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); - if (pixbuf != NULL) { - /* Scale and insert the image */ - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, - GDK_INTERP_BILINEAR); - image = gtk_image_new_from_pixbuf(scale); + if (pixbuf) { + image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else image = gtk_image_new(); @@ -568,7 +563,6 @@ GtkWidget *hbox; GtkWidget *label; GdkPixbuf *pixbuf; - GdkPixbuf *scale; GList *list; GList *p; GtkSizeGroup *sg; @@ -622,24 +616,19 @@ proto_name = prpl_info->list_icon(account, NULL); g_snprintf(buf, sizeof(buf), "%s.png", proto_name); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + "16", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); if (pixbuf != NULL) { - /* Scale and insert the image */ - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, - GDK_INTERP_BILINEAR); - if (gaim_account_is_disconnected(account) && show_all && gaim_connections_get_all()) - gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.0, FALSE); - - image = gtk_image_new_from_pixbuf(scale); + gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); + + image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else image = gtk_image_new(); @@ -1543,14 +1532,14 @@ } GdkPixbuf * -gaim_gtk_create_prpl_icon(GaimAccount *account, double scale_factor) +gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size) { GaimPlugin *prpl; GaimPluginProtocolInfo *prpl_info; const char *protoname = NULL; char buf[256]; /* TODO: We should use a define for max file length */ char *filename = NULL; - GdkPixbuf *pixbuf, *scaled; + GdkPixbuf *pixbuf; g_return_val_if_fail(account != NULL, NULL); @@ -1572,16 +1561,14 @@ */ g_snprintf(buf, sizeof(buf), "%s.png", protoname); - filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", - "default", buf, NULL); + filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", + size == PIDGIN_PRPL_ICON_SMALL ? "16" : + size == PIDGIN_PRPL_ICON_MEDIUM ? "22" : "48", + buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); - scaled = gdk_pixbuf_scale_simple(pixbuf, 32*scale_factor, - 32*scale_factor, GDK_INTERP_BILINEAR); - g_object_unref(pixbuf); - - return scaled; + return pixbuf; } static GdkPixbuf * diff -r 974e8112b27e -r 29e443e0613f pidgin/gtkutils.h --- a/pidgin/gtkutils.h Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/gtkutils.h Sat Jan 27 10:15:07 2007 +0000 @@ -46,6 +46,13 @@ } GaimButtonStyle; +typedef enum +{ + PIDGIN_PRPL_ICON_SMALL, + PIDGIN_PRPL_ICON_MEDIUM, + PIDGIN_PRPL_ICON_LARGE +} PidginPrplIconSize; + #ifndef _WIN32 typedef enum { @@ -369,11 +376,7 @@ * the currently selected theme. * * @param account The account. - * @param scale_factor The amount to scale to the original image. - * The default size is 32x32 pixels. A scale - * factor of 1 means no scaling will be done. - * A scale factor of 0.5 means the length - * and width will be 16 pixels each. + * @param size The size of the icon to return. * * @return A newly-created pixbuf with a reference count of 1, * or NULL if any of several error conditions occurred: @@ -382,7 +385,7 @@ * to allocate the image buffer, or the image file * contained invalid data. */ -GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account, double scale_factor); +GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size); /** * Create a protocol icon with the status emblem overlayed in diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/Makefile.am --- a/pidgin/pixmaps/protocols/16/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/16/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -3,7 +3,7 @@ EXTRA_DIST = aim.png \ bonjour.png \ gadu-gadu.png \ - groupwise.png \ + novell.png \ icq.png \ irc.png \ jabber.png \ @@ -12,7 +12,7 @@ msn.png \ qq.png \ silc.png \ - sip.png \ + simple.png \ yahoo.png \ zephyr.png diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/groupwise.png Binary file pidgin/pixmaps/protocols/16/groupwise.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/novell.png Binary file pidgin/pixmaps/protocols/16/novell.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/scalable/Makefile.am --- a/pidgin/pixmaps/protocols/16/scalable/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = aim.svg \ bonjour.svg \ gadu-gadu.svg \ - groupwise.svg \ + novell.svg \ icq.svg \ irc.svg \ jabber.svg \ @@ -9,6 +9,6 @@ msn2.svg \ qq.svg \ silc.svg \ - sip.svg \ + simple.svg \ yahoo.svg \ zephyr.svg diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/scalable/groupwise.svg --- a/pidgin/pixmaps/protocols/16/scalable/groupwise.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,350 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/novell.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/simple.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/scalable/sip.svg --- a/pidgin/pixmaps/protocols/16/scalable/sip.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,483 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/simple.png Binary file pidgin/pixmaps/protocols/16/simple.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/16/sip.png Binary file pidgin/pixmaps/protocols/16/sip.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/Makefile.am --- a/pidgin/pixmaps/protocols/22/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/22/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -3,7 +3,7 @@ EXTRA_DIST = aim.png \ bonjour.png \ gadu-gadu.png \ - groupwise.png \ + novell.png \ icq.png \ irc.png \ jabber.png \ @@ -12,7 +12,7 @@ msn.png \ qq.png \ silc.png \ - sip.png \ + simple.png \ yahoo.png \ zephyr.png diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/groupwise.png Binary file pidgin/pixmaps/protocols/22/groupwise.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/novell.png Binary file pidgin/pixmaps/protocols/22/novell.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/scalable/Makefile.am --- a/pidgin/pixmaps/protocols/22/scalable/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -1,14 +1,14 @@ EXTRA_DIST = aim.svg \ bonjour.svg \ gadu-gadu.svg \ - groupwise.svg \ + novell.svg \ icq.svg \ irc.svg \ jabber.svg \ meanwhile.svg \ - msn2.svg \ + msn.svg \ qq.svg \ silc.svg \ - sip.svg \ + simple.svg \ yahoo.svg \ zephyr.svg diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/scalable/groupwise.svg --- a/pidgin/pixmaps/protocols/22/scalable/groupwise.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/novell.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/simple.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/scalable/sip.svg --- a/pidgin/pixmaps/protocols/22/scalable/sip.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/simple.png Binary file pidgin/pixmaps/protocols/22/simple.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/22/sip.png Binary file pidgin/pixmaps/protocols/22/sip.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/Makefile.am --- a/pidgin/pixmaps/protocols/48/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/48/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -3,7 +3,7 @@ EXTRA_DIST = aim.png \ bonjour.png \ gadu-gadu.png \ - groupwise.png \ + novell.png \ icq.png \ irc.png \ jabber.png \ @@ -12,7 +12,7 @@ msn.png \ qq.png \ silc.png \ - sip.png \ + simple.png \ yahoo.png \ zephyr.png diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/groupwise.png Binary file pidgin/pixmaps/protocols/48/groupwise.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/novell.png Binary file pidgin/pixmaps/protocols/48/novell.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/scalable/Makefile.am --- a/pidgin/pixmaps/protocols/48/scalable/Makefile.am Sat Jan 27 09:20:49 2007 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/Makefile.am Sat Jan 27 10:15:07 2007 +0000 @@ -1,14 +1,14 @@ EXTRA_DIST = aim.svg \ bonjour.svg \ gadu-gadu.svg \ - groupwise.svg \ + novell.svg \ icq.svg \ irc.svg \ jabber.svg \ meanwhile.svg \ - msn2.svg \ + msn.svg \ qq.svg \ silc.svg \ - sip.svg \ + simple.svg \ yahoo.svg \ zephyr.svg diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/scalable/groupwise.svg --- a/pidgin/pixmaps/protocols/48/scalable/groupwise.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/scalable/novell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/novell.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/scalable/simple.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/48/scalable/simple.svg Sat Jan 27 10:15:07 2007 +0000 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/scalable/sip.svg --- a/pidgin/pixmaps/protocols/48/scalable/sip.svg Sat Jan 27 09:20:49 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/simple.png Binary file pidgin/pixmaps/protocols/48/simple.png has changed diff -r 974e8112b27e -r 29e443e0613f pidgin/pixmaps/protocols/48/sip.png Binary file pidgin/pixmaps/protocols/48/sip.png has changed