[Xfce4-commits] [xfce/xfce4-power-manager] 62/64: Add in the new icons Simon created

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit cd1daca19598826d8d2e55c15c90bcd2e972d8f5
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Fri May 23 20:22:59 2014 +0300

    Add in the new icons Simon created
---
 common/xfpm-icons.h        |    2 ++
 common/xfpm-power-common.c |   23 +++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/common/xfpm-icons.h b/common/xfpm-icons.h
index 5ebc063..a15a7c2 100644
--- a/common/xfpm-icons.h
+++ b/common/xfpm-icons.h
@@ -42,6 +42,8 @@ G_BEGIN_DECLS
 #define XFPM_PHONE_ICON_PREFIX			"xfpm-phone-"
 #define XFPM_MEDIA_PLAYER_PREFIX        "xfpm-mediaplayer-"
 #define XFPM_MONITOR_PREFIX             "xfpm-monitor-"
+#define XFPM_COMPUTER_ICON_PREFIX       "xfpm-computer-"
+#define XFPM_TABLET_ICON_PREFIX         "xfpm-tablet-"
 
 #define XFPM_DISPLAY_BRIGHTNESS_ICON	        "xfpm-brightness-lcd"
 #define XFPM_DISPLAY_BRIGHTNESS_INVALID_ICON	"xfpm-brightness-lcd-missing" /* When no hw found */
diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index 149bca3..81dd2ba 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -175,48 +175,47 @@ xfpm_battery_get_icon_prefix_device_enum_type (UpDeviceKind type)
      */
     if ( type == UP_DEVICE_KIND_BATTERY )
     {
-	return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
+        return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_UPS )
     {
-	return g_strdup (XFPM_UPS_ICON_PREFIX);
+        return g_strdup (XFPM_UPS_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_MOUSE )
     {
-	return g_strdup (XFPM_MOUSE_ICON_PREFIX);
+        return g_strdup (XFPM_MOUSE_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_KEYBOARD )
     {
-	return g_strdup (XFPM_KBD_ICON_PREFIX);
+        return g_strdup (XFPM_KBD_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_PHONE )
     {
-	return g_strdup (XFPM_PHONE_ICON_PREFIX);
+        return g_strdup (XFPM_PHONE_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_PDA )
     {
-	return g_strdup (XFPM_PDA_ICON_PREFIX);
+        return g_strdup (XFPM_PDA_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_MEDIA_PLAYER )
     {
-	return g_strdup (XFPM_MEDIA_PLAYER_PREFIX);
+        return g_strdup (XFPM_MEDIA_PLAYER_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_LINE_POWER )
     {
-	return g_strdup (XFPM_AC_ADAPTER_ICON);
+        return g_strdup (XFPM_AC_ADAPTER_ICON);
     }
     else if ( type == UP_DEVICE_KIND_MONITOR )
     {
-	return g_strdup (XFPM_MONITOR_PREFIX);
+        return g_strdup (XFPM_MONITOR_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_TABLET )
     {
-	/* Tablet ... pda, same thing :) */
-	return g_strdup (XFPM_PDA_ICON_PREFIX);
+        return g_strdup (XFPM_TABLET_ICON_PREFIX);
     }
     else if ( type == UP_DEVICE_KIND_COMPUTER )
     {
-	return g_strdup (XFPM_PRIMARY_ICON_PREFIX);
+        return g_strdup (XFPM_COMPUTER_ICON_PREFIX);
     }
 
     return g_strdup (XFPM_PRIMARY_ICON_PREFIX);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.