This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 9f1d9fd3fe311cd48c2a1a5517c9554fac2b298f
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Tue May 27 12:55:30 2014 +0200
Spring cleaning of old and unused icons
---
common/xfpm-icons.h | 5 -----
src/xfpm-power.c | 23 ++---------------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h
index a15a7c2..a417aab 100644
--- a/common/xfpm-icons.h
+++ b/common/xfpm-icons.h
@@ -25,15 +25,12 @@ G_BEGIN_DECLS
#define XFPM_AC_ADAPTER_ICON "xfpm-ac-adapter"
-#define XFPM_BATTERY_ICON "battery"
#define XFPM_UPS_ICON "xfpm-ups-100"
#define XFPM_KBD_ICON "xfpm-keyboard-100"
#define XFPM_MOUSE_ICON "xfpm-mouse-100"
#define XFPM_PHONE_ICON "xfpm-phone-100"
#define XFPM_PDA_ICON "xfpm-pda-100"
-#define XFPM_PROCESSOR_ICON "processor"
-
#define XFPM_PRIMARY_ICON_PREFIX "xfpm-primary-"
#define XFPM_UPS_ICON_PREFIX "xfpm-ups-"
#define XFPM_MOUSE_ICON_PREFIX "xfpm-mouse-"
@@ -47,8 +44,6 @@ G_BEGIN_DECLS
#define XFPM_DISPLAY_BRIGHTNESS_ICON "xfpm-brightness-lcd"
#define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON "xfpm-brightness-lcd-missing"
/* When no hw found */
-#define XFPM_HIBERNATE_ICON "xfpm-hibernate"
-#define XFPM_SUSPEND_ICON "xfpm-suspend"
G_END_DECLS
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index a04170b..8aab573 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -327,14 +327,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar
*sleep_time, gboolean force)
{
if ( !xfpm_power_prompt_password (power) )
{
- const gchar *icon_name;
- if ( !g_strcmp0 (sleep_time, "Hibernate") )
- icon_name = XFPM_HIBERNATE_ICON;
- else
- icon_name = XFPM_SUSPEND_ICON;
-
- xfpm_power_report_error (power, _("Incorrect password
entered"), icon_name);
-
+ xfpm_power_report_error (power, _("Incorrect password
entered"), "dialog-error");
return;
}
}
@@ -421,13 +414,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar
*sleep_time, gboolean force)
}
else
{
- const gchar *icon_name;
- if ( !g_strcmp0 (sleep_time, "Hibernate") )
- icon_name = XFPM_HIBERNATE_ICON;
- else
- icon_name = XFPM_SUSPEND_ICON;
-
- xfpm_power_report_error (power, error->message, icon_name);
+ xfpm_power_report_error (power, error->message, "dialog-error");
g_error_free (error);
}
}
@@ -625,8 +612,6 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
{
GtkWidget *hibernate;
hibernate = gtk_button_new_with_label (_("Hibernate"));
- img = gtk_image_new_from_icon_name (XFPM_HIBERNATE_ICON,
GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (hibernate), img);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), hibernate,
GTK_RESPONSE_NONE);
g_signal_connect_swapped (hibernate, "clicked",
@@ -638,8 +623,6 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
GtkWidget *suspend;
suspend = gtk_button_new_with_label (_("Suspend"));
- img = gtk_image_new_from_icon_name (XFPM_SUSPEND_ICON,
GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (suspend), img);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), suspend,
GTK_RESPONSE_NONE);
g_signal_connect_swapped (suspend, "clicked",
@@ -651,8 +634,6 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
GtkWidget *shutdown;
shutdown = gtk_button_new_with_label (_("Shutdown"));
- img = gtk_image_new_from_icon_name (XFPM_SUSPEND_ICON,
GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (shutdown), img);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), shutdown,
GTK_RESPONSE_NONE);
g_signal_connect_swapped (shutdown, "clicked",
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
