diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-02-02 12:45:05 +0100 |
|---|---|---|
| committer | Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-02-02 21:27:19 +0100 |
| commit | ce87c26c0049336ec62ebcf03a93c589c8818d20 (patch) | |
| tree | 6cf38ecd347f547a475d48f6b98104be08bd9228 /gtk-gui.c | |
| parent | 459130009b6ca1683ba82e720cc97f4ebeb187c9 (diff) | |
| download | subsurface-ce87c26c0049336ec62ebcf03a93c589c8818d20.tar.gz | |
Move about icon to include file
Getting the about icon to display in various scenarios on MacOSX
was a pain. Moving the icon to an include file solved the problem.
This commit also fixes the problem Dirk was having when converting
satellite.svg to a png in commit cf3c0266c2. I couldn't
quite get ImageMagick to preserve transparency and color when
converting subsurface-icon.svg, though, so I used Gimp instead.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -25,6 +25,10 @@ #include "libdivecomputer.h" +#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gdk-pixbuf/gdk-pixdata.h> +#include "subsurface-icon.h" + GtkWidget *main_window; GtkWidget *main_vbox; GtkWidget *error_info_bar; @@ -1037,12 +1041,8 @@ static void about_dialog(GtkWidget *w, gpointer data) GtkWidget * dialog; if (need_icon) { - GtkWidget *image = gtk_image_new_from_file(subsurface_icon_name()); - - if (gtk_image_get_storage_type(GTK_IMAGE(image)) == GTK_IMAGE_PIXBUF) { - logo = gtk_image_get_pixbuf(GTK_IMAGE(image)); - logo_property = "logo"; - } + logo_property = "logo"; + logo = gdk_pixbuf_from_pixdata(&subsurface_icon_pixbuf, TRUE, NULL); } dialog = gtk_about_dialog_new(); #if !GTK_CHECK_VERSION(2,24,0) /* F*cking gtk */ |