aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-10-05 04:48:10 +0800
committerChristian Persch <chpe@src.gnome.org>2004-10-05 04:48:10 +0800
commit10c24e409012e113bf8dd28d30ef2f6a89b7438b (patch)
treeff3d999af2e803f1e656dc6096ba833b5418db70
parentdfc20ea405ca7bb32b4f3f2d46df2bb8ab9560a5 (diff)
downloadgsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar.gz
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar.bz2
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar.lz
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar.xz
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.tar.zst
gsoc2013-epiphany-10c24e409012e113bf8dd28d30ef2f6a89b7438b.zip
Arg 4 of gtk_icon_theme_lookup_icon is flags, not height.
2004-10-04 Christian Persch <chpe@cvs.gnome.org> * embed/downloader-view.c: (downloader_view_add_download): Arg 4 of gtk_icon_theme_lookup_icon is flags, not height.
-rw-r--r--ChangeLog6
-rw-r--r--embed/downloader-view.c12
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f91f18835..d8821dfcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-10-04 Christian Persch <chpe@cvs.gnome.org>
+ * embed/downloader-view.c: (downloader_view_add_download):
+
+ Arg 4 of gtk_icon_theme_lookup_icon is flags, not height.
+
+2004-10-04 Christian Persch <chpe@cvs.gnome.org>
+
* src/window-commands.c: (window_cmd_help_about):
Set epiphany icon on the about dialogue.
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 32975231c..0b17058d3 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -488,20 +488,18 @@ downloader_view_add_download (DownloaderView *dv,
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
width *= 2;
- height *= 2;
- icon_info = gtk_icon_theme_lookup_icon (theme, icon_name, width, height);
+ icon_info = gtk_icon_theme_lookup_icon (theme, icon_name, width, 0);
g_free (icon_name);
if (icon_info == NULL) return;
- icon_name = g_strdup (gtk_icon_info_get_filename (icon_info));
+ pixbuf = gdk_pixbuf_new_from_file_at_size
+ (gtk_icon_info_get_filename (icon_info), width, width, NULL);
gtk_icon_info_free (icon_info);
-
- pixbuf = gdk_pixbuf_new_from_file_at_size (icon_name, width, height, NULL);
- g_free (icon_name);
+
gtk_list_store_set (GTK_LIST_STORE (dv->priv->model),
&iter, COL_IMAGE, pixbuf, -1);
- if (pixbuf)
+ if (pixbuf != NULL)
{
g_object_unref (pixbuf);
}