diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-02-03 07:49:45 +1100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-02-03 07:49:45 +1100 |
| commit | ec1998216fb636cba8fb798bb677caaeb42f9a68 (patch) | |
| tree | 329d33c2d93166d8012286ff256deea066ff1e0f /gtk-gui.c | |
| parent | 99dbd667bf2a40f2ea8444780310114e353f4557 (diff) | |
| parent | ce87c26c0049336ec62ebcf03a93c589c8818d20 (diff) | |
| download | subsurface-ec1998216fb636cba8fb798bb677caaeb42f9a68.tar.gz | |
Merge branch 'subsurface-icon' of github.com:henrik242/subsurface
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 */ |