diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-02-22 19:46:06 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-02-22 19:46:06 +0000 |
| commit | 7ebaa9d38fc6033fbc1c3562ab85a01c12d36c78 (patch) | |
| tree | 680f2a077e7231b808edf1ac0b1122e16cd6652c /src/trg-about-window.c | |
| parent | ec9b550c821afc205a440d86031c2208a863b33a (diff) | |
fix hardcoded icon path in about dialog. in Makefile, fix sed hang waiting for input on FreeBSD (thanks to JDM).
Diffstat (limited to 'src/trg-about-window.c')
| -rw-r--r-- | src/trg-about-window.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/trg-about-window.c b/src/trg-about-window.c index 8ece638..3e9e3af 100644 --- a/src/trg-about-window.c +++ b/src/trg-about-window.c @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -29,32 +28,24 @@ #include "trg-about-window.h" #include "util.h" -GtkWidget *trg_about_window_new(GtkWindow * parent) +GtkWidget *trg_about_window_new(GtkWindow *parent) { GtkWidget *dialog; GdkPixbuf *logo; - GError *error = NULL; - const gchar *trgAuthors[] = { "Alan Fitton <ajf@eth0.org.uk>", NULL }; + + const gchar *trgAuthors[] = { "Alan Fitton <alan@eth0.org.uk>", NULL }; dialog = gtk_about_dialog_new(); gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); - logo = - gdk_pixbuf_new_from_file("/usr/share/pixmaps/transmission.png", - &error); - if (error == NULL) + logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), PACKAGE_NAME, 48, + GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + + if (logo != NULL) + { gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), logo); - else { - if (error->domain == GDK_PIXBUF_ERROR) - g_print("GdkPixbufError: %s\n", error->message); - else if (error->domain == G_FILE_ERROR) - g_print("GFileError: %s\n", error->message); - else - g_print - ("An error in the domain: %d has occurred!\n", - error->domain); - g_error_free(error); + g_object_unref(logo); } /* Set application data that will be displayed in the main dialog. */ |