[Xfce4-commits] <xfce4-mount-plugin:master> Use drive-harddisk instead of xfce-mount in properties dialog/desktop file

[Landry Breuil]

Updating branch refs/heads/master
         to 60d4358a82d98b1fbd4ef3d20f9881ed1585f390 (commit)
       from 4ac8d200c2b874ccfba999fcb76d0a296f15c4e4 (commit)

commit 60d4358a82d98b1fbd4ef3d20f9881ed1585f390
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Apr 10 19:44:08 2012 +0200

    Use drive-harddisk instead of xfce-mount in properties dialog/desktop file
    
    Remove old xfce-mount.png icon. Much better to use a standard icon.

 icons/Makefile.am                          |    7 +------
 icons/xfce-mount.png                       |  Bin 1990 -> 0 bytes
 panel-plugin/mount-plugin.c                |   13 +++----------
 panel-plugin/xfce4-mount-plugin.desktop.in |    2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/icons/Makefile.am b/icons/Makefile.am
index fc57ddf..01a32a2 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,13 +1,8 @@
-hicolor48dir = $(datadir)/icons/hicolor/48x48/apps
-
-hicolor48_DATA = \
-	xfce-mount.png
-	
 hicolorSVGdir = $(datadir)/icons/hicolor/scalable/apps
 
 hicolorSVG_DATA = \	
 	xfce-mount.svg
 
-EXTRA_DIST = $(hicolor48_DATA) $(hicolorSVG_DATA)
+EXTRA_DIST = $(hicolorSVG_DATA)
 	
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/icons/xfce-mount.png b/icons/xfce-mount.png
deleted file mode 100644
index ed88179..0000000
Binary files a/icons/xfce-mount.png and /dev/null differ
diff --git a/panel-plugin/mount-plugin.c b/panel-plugin/mount-plugin.c
index 3d9a0ac..689b8ec 100644
--- a/panel-plugin/mount-plugin.c
+++ b/panel-plugin/mount-plugin.c
@@ -736,25 +736,18 @@ mounter_create_options (XfcePanelPlugin *plugin, t_mounter *mt)
 
     xfce_panel_plugin_block_menu (plugin);
 
-    GtkWidget *dlg; //, *header;
-    //dlg = gtk_dialog_new_with_buttons (_("Edit Properties"),
+    GtkWidget *dlg;
     dlg = xfce_titled_dialog_new_with_buttons(
                 _("Mount Plugin"),
                 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
                 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                 GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
 
-    gtk_window_set_icon_name(GTK_WINDOW(dlg),"xfce-mount");
+    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Properties"));
+    gtk_window_set_icon_name(GTK_WINDOW(dlg),"drive-harddisk");
 
     gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
 
-    /* header = xfce_create_header (NULL, _("Mount devices"));
-    gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
-    gtk_widget_show (header);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, FALSE,
-                        TRUE, 0); */
-
     GtkWidget *vbox;
     t_mounter_dialog * md;
 
diff --git a/panel-plugin/xfce4-mount-plugin.desktop.in b/panel-plugin/xfce4-mount-plugin.desktop.in
index ae9bcaa..70235ac 100644
--- a/panel-plugin/xfce4-mount-plugin.desktop.in
+++ b/panel-plugin/xfce4-mount-plugin.desktop.in
@@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Mount devices
 _Comment=Shows all mountable devices and (un)mounts them on request.
-Icon=xfce-mount
+Icon=drive-harddisk
 X-XFCE-Internal=FALSE
 X-XFCE-Module=mount