[Xfce4-commits] <xfce4-cpufreq-plugin:master> Rename cpu.png to xfce4-cpufreq-plugin

Florian Rivoal noreply at xfce.org
Sun Jan 23 11:26:05 CET 2011


Updating branch refs/heads/master
         to 156052f4c2f468eb6e282b946fe2acfff3d020bb (commit)
       from 6836d994bb9191e5b16838d1fcfcbf23bc4ba99d (commit)

commit 156052f4c2f468eb6e282b946fe2acfff3d020bb
Author: Florian Rivoal <frivoal at xfce.org>
Date:   Sun Jan 23 10:05:23 2011 +0900

    Rename cpu.png to xfce4-cpufreq-plugin

 icons/16x16/Makefile.am                           |    2 +-
 icons/16x16/{cpu.png => xfce4-cpufreq-plugin.png} |  Bin 671 -> 671 bytes
 icons/22x22/Makefile.am                           |    2 +-
 icons/22x22/{cpu.png => xfce4-cpufreq-plugin.png} |  Bin 1039 -> 1039 bytes
 icons/48x48/Makefile.am                           |    2 +-
 icons/48x48/{cpu.png => xfce4-cpufreq-plugin.png} |  Bin 3077 -> 3077 bytes
 panel-plugin/xfce4-cpufreq-configure.c            |    2 +-
 panel-plugin/xfce4-cpufreq-overview.c             |    4 ++--
 panel-plugin/xfce4-cpufreq-plugin.c               |    4 ++--
 panel-plugin/xfce4-cpufreq-plugin.desktop.in.in   |    2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index eb39bae..633b1d0 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,7 +1,7 @@
 iconsdir = $(datadir)/icons/hicolor/16x16/apps
 
 icons_DATA = 			\
-	cpu.png
+	xfce4-cpufreq-plugin.png
 
 EXTRA_DIST =			\
 	$(icons_DATA)
diff --git a/icons/16x16/cpu.png b/icons/16x16/xfce4-cpufreq-plugin.png
similarity index 100%
rename from icons/16x16/cpu.png
rename to icons/16x16/xfce4-cpufreq-plugin.png
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 0e4550a..b59ada4 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,7 +1,7 @@
 iconsdir = $(datadir)/icons/hicolor/22x22/apps
 
 icons_DATA = 			\
-	cpu.png
+	xfce4-cpufreq-plugin.png
 
 EXTRA_DIST =			\
 	$(icons_DATA)
diff --git a/icons/22x22/cpu.png b/icons/22x22/xfce4-cpufreq-plugin.png
similarity index 100%
rename from icons/22x22/cpu.png
rename to icons/22x22/xfce4-cpufreq-plugin.png
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 7d1f110..f52ca19 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,7 +1,7 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 
 icons_DATA = 			\
-	cpu.png
+	xfce4-cpufreq-plugin.png
 
 EXTRA_DIST =			\
 	$(icons_DATA)
diff --git a/icons/48x48/cpu.png b/icons/48x48/xfce4-cpufreq-plugin.png
similarity index 100%
rename from icons/48x48/cpu.png
rename to icons/48x48/xfce4-cpufreq-plugin.png
diff --git a/panel-plugin/xfce4-cpufreq-configure.c b/panel-plugin/xfce4-cpufreq-configure.c
index 09b9815..d5ff97f 100644
--- a/panel-plugin/xfce4-cpufreq-configure.c
+++ b/panel-plugin/xfce4-cpufreq-configure.c
@@ -112,7 +112,7 @@ cpufreq_configure (XfcePanelPlugin *plugin)
 	xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), _("Configure the CPU frequency plugin"));
 
 	gtk_window_set_position   (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-	gtk_window_set_icon_name  (GTK_WINDOW (dialog), "cpu");
+	gtk_window_set_icon_name  (GTK_WINDOW (dialog), "xfce4-cpufreq-plugin");
 	gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
 	gtk_window_stick          (GTK_WINDOW (dialog));
 
diff --git a/panel-plugin/xfce4-cpufreq-overview.c b/panel-plugin/xfce4-cpufreq-overview.c
index e3a0e6d..18be4b8 100644
--- a/panel-plugin/xfce4-cpufreq-overview.c
+++ b/panel-plugin/xfce4-cpufreq-overview.c
@@ -53,7 +53,7 @@ cpufreq_overview_add (CpuInfo *cpu, guint cpu_number, GtkWidget *dialog_hbox)
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 	g_free (text);
 
-	icon = gtk_image_new_from_icon_name ("cpu", GTK_ICON_SIZE_BUTTON);
+	icon = gtk_image_new_from_icon_name ("xfce4-cpufreq-plugin", GTK_ICON_SIZE_BUTTON);
 	gtk_box_pack_start (GTK_BOX (dialog_vbox), icon, FALSE, FALSE, 0);
 	gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0);
 	gtk_misc_set_padding (GTK_MISC (icon), 10, 10);
@@ -202,7 +202,7 @@ cpufreq_overview (GtkWidget *widget, GdkEventButton *ev, CpuFreqPlugin *cpuFreq)
 			_("An overview of all the CPUs in the system"));
 
 	gtk_window_set_position   (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-	gtk_window_set_icon_name  (GTK_WINDOW (dialog), "cpu");
+	gtk_window_set_icon_name  (GTK_WINDOW (dialog), "xfce4-cpufreq-plugin");
 
 	g_object_set_data (G_OBJECT (cpuFreq->plugin), "overview", dialog);
 
diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c
index db109fb..2d45e35 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.c
+++ b/panel-plugin/xfce4-cpufreq-plugin.c
@@ -160,7 +160,7 @@ cpufreq_update_icon (CpuFreqPlugin *cpufreq)
 	{
 
 		GdkPixbuf *buf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-				                                     "cpu", cpufreq->icon_size, 0, NULL);
+				                                     "xfce4-cpufreq-plugin", cpufreq->icon_size, 0, NULL);
 		if (buf)
 		{
 			cpufreq->icon = gtk_image_new_from_pixbuf (buf);
@@ -168,7 +168,7 @@ cpufreq_update_icon (CpuFreqPlugin *cpufreq)
 		}
 		else
 		{
-			cpufreq->icon = gtk_image_new_from_icon_name ("cpu", GTK_ICON_SIZE_BUTTON);
+			cpufreq->icon = gtk_image_new_from_icon_name ("xfce4-cpufreq-plugin", GTK_ICON_SIZE_BUTTON);
 		}
 		gtk_box_pack_start (GTK_BOX (cpufreq->box), cpufreq->icon, FALSE, FALSE, 0);
 		gtk_widget_show (cpufreq->icon);
diff --git a/panel-plugin/xfce4-cpufreq-plugin.desktop.in.in b/panel-plugin/xfce4-cpufreq-plugin.desktop.in.in
index d3126b4..a97aafa 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.desktop.in.in
+++ b/panel-plugin/xfce4-cpufreq-plugin.desktop.in.in
@@ -3,5 +3,5 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=CPU Frequency Monitor
 _Comment=Shows the cpu frequency and governours
-Icon=cpu
+Icon=xfce4-cpufreq-plugin
 X-XFCE-Exec=@PLUGIN_PATH@/xfce4-cpufreq-plugin



More information about the Xfce4-commits mailing list