From 7ebaa9d38fc6033fbc1c3562ab85a01c12d36c78 Mon Sep 17 00:00:00 2001
From: Alan Fitton <ajf@eth0.org.uk>
Date: Tue, 22 Feb 2011 19:46:06 +0000
Subject: fix hardcoded icon path in about dialog. in Makefile, fix sed hang
 waiting for input on FreeBSD (thanks to JDM).

---
 src/Makefile.am        |  2 +-
 src/trg-about-window.c | 27 +++++++++------------------
 src/trg-menu-bar.c     |  1 +
 3 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index ac97ef1..eb7380a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,4 +109,4 @@ install-icons:
         done
 
 transmission-remote-gtk.desktop: transmission-remote-gtk.desktop.in
-	sed -e 's,@bindir\@,$(bindir),g' $< > $@
+	sed -e 's,@bindir\@,$(bindir),g' <transmission-remote-gtk.desktop.in > $@
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. */
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c
index 606b590..70e91a2 100644
--- a/src/trg-menu-bar.c
+++ b/src/trg-menu-bar.c
@@ -219,6 +219,7 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBarPrivate * priv)
                                    (priv->mb_view_notebook), TRUE);
 
     priv->mb_view_stats = gtk_menu_item_new_with_mnemonic("_Statistics");
+    gtk_widget_set_sensitive(priv->mb_view_stats, FALSE);
 
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_states);
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu),
-- 
cgit v1.2.3