[Xfce4-commits] <xfce4-diskperf-plugin:master> Use drive-harddisk instead of deprecated gtk-harddisk

[Landry Breuil]

Updating branch refs/heads/master
         to 769607bf07aad1e48595232fe7bdcb11e5556598 (commit)
       from bfb820205db6037a517aad8de86dfcf47b43fde2 (commit)

commit 769607bf07aad1e48595232fe7bdcb11e5556598
Author: Landry Breuil <landry at xfce.org>
Date:   Mon Apr 9 18:06:30 2012 +0200

    Use drive-harddisk instead of deprecated gtk-harddisk
    
    While here, display the icon in about & properties dialog

 panel-plugin/diskperf.desktop.in |    5 ++---
 panel-plugin/main.c              |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/diskperf.desktop.in b/panel-plugin/diskperf.desktop.in
index e9f78bf..a241104 100644
--- a/panel-plugin/diskperf.desktop.in
+++ b/panel-plugin/diskperf.desktop.in
@@ -3,7 +3,6 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Disk Performance Monitor
 _Comment=Show disk performance
-Icon=gtk-harddisk
+Icon=drive-harddisk
 X-XFCE-Internal=FALSE
-X-XFCE-module=diskperf
-
+X-XFCE-Module=diskperf
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 5afcdbe..91ddc66 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -898,10 +898,13 @@ static int CheckStatsAvailability ()
 static void About (Widget_t w, void *unused)
 	/* Called back when the About button in clicked */
 {
+   GdkPixbuf *icon;
    const gchar *auth[] = { "Roger Seguin <roger_seguin at msn.com>",
 	"NetBSD statistics collection: (c) 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>",
 	"Solaris statistics collection: (c) 2011 Peter Tribble <peter.tribble at gmail.com>", NULL };
+   icon = xfce_panel_pixbuf_from_source("drive-harddisk", NULL, 32);
    gtk_show_about_dialog(NULL,
+      "logo", icon,
       "license", xfce_get_license_text (XFCE_LICENSE_TEXT_BSD),
       "version", PACKAGE_VERSION,
       "program-name", PACKAGE_NAME,
@@ -951,7 +954,7 @@ static void diskperf_create_options (XfcePanelPlugin *plugin,
                       G_CALLBACK (diskperf_dialog_response), poPlugin);
 
     gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
-    gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+    gtk_window_set_icon_name (GTK_WINDOW (dlg), "drive-harddisk");
     
     vbox = gtk_vbox_new(FALSE, BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);