changeset
Clean up the merge I just did.
Thu, 27 Nov 2008 06:54:03 +0000
- author
- Richard Laager <rlaager@pidgin.im>
- date
- Thu, 27 Nov 2008 06:54:03 +0000
- branch
- next.minor
- changeset 24989
- 81e2345f35f3
- parent 24988
- 4150b857c58b
- child 24990
- e2fdc2cd23a4
Clean up the merge I just did.
| pidgin/pidginstock.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/pidginstock.c Thu Nov 27 06:46:25 2008 +0000 +++ b/pidgin/pidginstock.c Thu Nov 27 06:54:03 2008 +0000 @@ -321,7 +321,7 @@ { const gchar *file, *dir; gchar *file_full = NULL; - gchar *tmp; + gchar *tmp; if (theme != NULL) { file = pidgin_icon_theme_get_icon(PIDGIN_ICON_THEME(theme), sized_icon.name); @@ -353,7 +353,6 @@ const char *size, SizedStockIcon sized_icon, gboolean translucent) { char *filename; - char *subpath; GtkIconSource *source; GdkPixbuf *pixbuf; @@ -394,7 +393,7 @@ do_alphashift(pixbuf, pixbuf); source = gtk_icon_source_new(); - gtk_icon_source_set_pixbuf(source, pixbuf); + gtk_icon_source_set_pixbuf(source, pixbuf); gtk_icon_source_set_filename(source, filename); gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL); gtk_icon_source_set_size(source, sizeid);
