[Xfce4-commits] [xfce/xfce4-power-manager] 01/02: Plugin: Rename to Power Manager Plugin

noreply at xfce.org noreply at xfce.org
Mon Aug 18 19:11:35 CEST 2014


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 380abbff2c63e352c7241b81ae069e7e3381cea3
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Aug 18 19:37:57 2014 +0300

    Plugin: Rename to Power Manager Plugin
    
    Since the brightness plugin merged with the battery plugin,
    rename it to Power Manager Plugin. Also since we support
    LXDE we'll stop calling it the Xfce Power Manager Plugin as
    a LXDE plugin.
---
 configure.ac.in                                    |    6 +-
 panel-plugins/Makefile.am                          |    2 +-
 .../xfce/xfce4-battery-plugin.desktop.in.in        |    8 -
 .../{battery => power-manager-plugin}/Makefile.am  |    0
 .../lxde/Makefile.am                               |   22 +--
 .../lxde/lxde-power-manager-plugin.c}              |   62 +++----
 .../power-manager-button.c}                        |  188 ++++++++++----------
 .../power-manager-button.h}                        |   32 ++--
 .../scalemenuitem.c                                |    0
 .../scalemenuitem.h                                |    0
 .../xfce/Makefile.am                               |   20 +--
 .../xfce/power-manager-plugin.desktop.in.in        |    8 +
 .../xfce/xfce-power-manager-plugin.c}              |   42 ++---
 13 files changed, 196 insertions(+), 194 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 1339acc..1f6763d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -213,9 +213,9 @@ common/Makefile
 src/Makefile
 settings/Makefile
 panel-plugins/Makefile
-panel-plugins/battery/Makefile
-panel-plugins/battery/lxde/Makefile
-panel-plugins/battery/xfce/Makefile
+panel-plugins/power-manager-plugin/Makefile
+panel-plugins/power-manager-plugin/lxde/Makefile
+panel-plugins/power-manager-plugin/xfce/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/panel-plugins/Makefile.am b/panel-plugins/Makefile.am
index 2810820..fdfbd5f 100644
--- a/panel-plugins/Makefile.am
+++ b/panel-plugins/Makefile.am
@@ -1,3 +1,3 @@
 
 SUBDIRS =            \
-	battery
+	power-manager-plugin
diff --git a/panel-plugins/battery/xfce/xfce4-battery-plugin.desktop.in.in b/panel-plugins/battery/xfce/xfce4-battery-plugin.desktop.in.in
deleted file mode 100644
index 48b7ba2..0000000
--- a/panel-plugins/battery/xfce/xfce4-battery-plugin.desktop.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-_Name=Battery indicator plugin
-_Comment=Display the battery levels of your devices
-Icon=xfpm-primary-100-charging
-X-XFCE-Module=xfce4battery
-X-XFCE-Unique=TRUE
-X-XFCE-Internal=false
diff --git a/panel-plugins/battery/Makefile.am b/panel-plugins/power-manager-plugin/Makefile.am
similarity index 100%
rename from panel-plugins/battery/Makefile.am
rename to panel-plugins/power-manager-plugin/Makefile.am
diff --git a/panel-plugins/battery/lxde/Makefile.am b/panel-plugins/power-manager-plugin/lxde/Makefile.am
similarity index 72%
rename from panel-plugins/battery/lxde/Makefile.am
rename to panel-plugins/power-manager-plugin/lxde/Makefile.am
index fbb8050..0d5faaa 100644
--- a/panel-plugins/battery/lxde/Makefile.am
+++ b/panel-plugins/power-manager-plugin/lxde/Makefile.am
@@ -1,26 +1,28 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"lxde-battery-plugin\" \
+	-DG_LOG_DOMAIN=\"lxde-power-manager-plugin\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
 
 #
-# lxde battery plugin
+# lxde power manager plugin
 #
 
 plugin_LTLIBRARIES =   \
-	lxdebattery.la
+	lxde_power_manager.la
 
 plugindir = \
 	$(libdir)/lxpanel/plugins
 
-lxdebattery_la_SOURCES =    \
-	battery-plugin.c        \
-	../battery-button.c     \
-	../battery-button.h
+lxde_power_manager_la_SOURCES =    \
+	lxde-power-manager-plugin.c   \
+	../power-manager-button.c     \
+	../power-manager-button.h     \
+	../scalemenuitem.c            \
+	../scalemenuitem.h
 
-lxdebattery_la_CFLAGS =             \
+lxde_power_manager_la_CFLAGS =             \
 	-I$(top_srcdir)	                \
 	-I$(top_srcdir)/src             \
 	-DLOCALEDIR=\"$(localedir)\"    \
@@ -36,13 +38,13 @@ lxdebattery_la_CFLAGS =             \
 	$(DBUS_GLIB_CFLAGS)             \
 	$(UPOWER_CFLAGS)
 
-lxdebattery_la_LDFLAGS = \
+lxde_power_manager_la_LDFLAGS = \
        -avoid-version \
        -module \
        -no-undefined \
        $(PLATFORM_LDFLAGS)
 
-lxdebattery_la_LIBADD =                     \
+lxde_power_manager_la_LIBADD =                     \
 	$(top_builddir)/common/libxfpmcommon.la \
 	$(LXDEPANEL_LIBS)                       \
 	$(LIBXFCE4UI_LIBS)                      \
diff --git a/panel-plugins/battery/lxde/battery-plugin.c b/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c
similarity index 54%
rename from panel-plugins/battery/lxde/battery-plugin.c
rename to panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c
index 9ddbbce..d668333 100644
--- a/panel-plugins/battery/lxde/battery-plugin.c
+++ b/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "../battery-button.h"
+#include "../power-manager-button.h"
 
 /* plugin structure */
 typedef struct
@@ -39,74 +39,74 @@ typedef struct
 
     /* panel widgets */
     GtkWidget       *ebox;
-    GtkWidget       *battery_button;
+    GtkWidget       *power_manager_button;
 }
-BatteryPlugin;
+PowerManagerPlugin;
 
 
 /* prototypes */
-static int battery_plugin_construct (Plugin *p, char **fp);
-static void battery_plugin_configuration_changed(Plugin *p);
+static int lxde_power_manager_plugin_construct (Plugin *p, char **fp);
+static void lxde_power_manager_plugin_configuration_changed(Plugin *p);
 
-PluginClass lxdebattery_plugin_class = {
+PluginClass lxde_power_manager_plugin_class = {
     PLUGINCLASS_VERSIONING,
-    type : "lxdebattery",
-    name : N_("Battery indicator plugin"),
+    type : "lxde_power_manager",
+    name : N_("Power Manager Plugin"),
     version: PACKAGE_VERSION,
-    description : N_("Display the battery levels of your devices"),
+    description : N_("Display the battery levels of your devices and control the brightness of your display"),
     one_per_system : FALSE,
     expand_available : FALSE,
-    constructor : battery_plugin_construct,
+    constructor : lxde_power_manager_plugin_construct,
     destructor  : NULL,
     config : NULL,
     save : NULL,
-    panel_configuration_changed : battery_plugin_configuration_changed
+    panel_configuration_changed : lxde_power_manager_plugin_configuration_changed
 };
 
 
-static BatteryPlugin *
-battery_plugin_new (Plugin *plugin)
+static PowerManagerPlugin *
+lxde_power_manager_plugin_new (Plugin *plugin)
 {
-    BatteryPlugin *battery_plugin;
+    PowerManagerPlugin *power_manager_plugin;
 
     /* allocate memory for the plugin structure */
-    battery_plugin = g_new0 (BatteryPlugin, 1);
+    power_manager_plugin = g_new0 (PowerManagerPlugin, 1);
 
     /* pointer to plugin */
-    battery_plugin->plugin = plugin;
+    power_manager_plugin->plugin = plugin;
 
     /* create some panel ebox */
-    battery_plugin->ebox = gtk_event_box_new ();
-    gtk_widget_show (battery_plugin->ebox);
-    gtk_event_box_set_visible_window (GTK_EVENT_BOX(battery_plugin->ebox), FALSE);
+    power_manager_plugin->ebox = gtk_event_box_new ();
+    gtk_widget_show (power_manager_plugin->ebox);
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE);
 
-    battery_plugin->battery_button = battery_button_new (plugin);
-    battery_button_show(BATTERY_BUTTON(battery_plugin->battery_button));
-    gtk_container_add (GTK_CONTAINER (battery_plugin->ebox), battery_plugin->battery_button);
+    power_manager_plugin->power_manager_button = power_manager_button_new (plugin);
+    power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button));
+    gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button);
 
-    return battery_plugin;
+    return power_manager_plugin;
 }
 
 
 static int
-battery_plugin_construct (Plugin *plugin, char **fp)
+lxde_power_manager_plugin_construct (Plugin *plugin, char **fp)
 {
-    BatteryPlugin *battery_plugin;
+    PowerManagerPlugin *power_manager_plugin;
 
     /* create the plugin */
-    battery_plugin = battery_plugin_new (plugin);
+    power_manager_plugin = lxde_power_manager_plugin_new (plugin);
 
     /* add the ebox to the panel */
-    plugin->pwid = battery_plugin->ebox;
-    plugin->priv = battery_plugin;
+    plugin->pwid = power_manager_plugin->ebox;
+    plugin->priv = power_manager_plugin;
 
     return 1;
 }
 
 static void
-battery_plugin_configuration_changed(Plugin *p)
+lxde_power_manager_plugin_configuration_changed(Plugin *p)
 {
-    BatteryPlugin *battery_plugin = p->priv;
+    PowerManagerPlugin *power_manager_plugin = p->priv;
 
     /* Determine orientation and size */
     GtkOrientation orientation = (p->panel->orientation == GTK_ORIENTATION_VERTICAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
@@ -119,5 +119,5 @@ battery_plugin_configuration_changed(Plugin *p)
         gtk_widget_set_size_request (p->pwid, size, -1);
 
     /* update the button's width */
-    battery_button_set_width (BATTERY_BUTTON(battery_plugin->battery_button), p->panel->icon_size);
+    power_manager_button_set_width (POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button), p->panel->icon_size);
 }
diff --git a/panel-plugins/battery/battery-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
similarity index 80%
rename from panel-plugins/battery/battery-button.c
rename to panel-plugins/power-manager-plugin/power-manager-button.c
index a556546..9d0aebd 100644
--- a/panel-plugins/battery/battery-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -39,17 +39,17 @@
 #include "common/xfpm-power-common.h"
 #include "common/xfpm-brightness.h"
 
-#include "battery-button.h"
+#include "power-manager-button.h"
 #include "scalemenuitem.h"
 
 
 #define SET_LEVEL_TIMEOUT (50)
 #define SAFE_SLIDER_MIN_LEVEL (5)
 
-#define BATTERY_BUTTON_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), BATTERY_TYPE_BUTTON, BatteryButtonPrivate))
+#define POWER_MANAGER_BUTTON_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), POWER_MANAGER_TYPE_BUTTON, PowerManagerButtonPrivate))
 
-struct BatteryButtonPrivate
+struct PowerManagerButtonPrivate
 {
 #ifdef XFCE_PLUGIN
     XfcePanelPlugin *plugin;
@@ -97,22 +97,22 @@ typedef struct
     GtkWidget   *menu_item;    /* The device's item on the menu (if shown) */
 } BatteryDevice;
 
-G_DEFINE_TYPE (BatteryButton, battery_button, GTK_TYPE_TOGGLE_BUTTON)
+G_DEFINE_TYPE (PowerManagerButton, power_manager_button, GTK_TYPE_TOGGLE_BUTTON)
 
-static void battery_button_finalize   (GObject *object);
-static GList* find_device_in_list (BatteryButton *button, const gchar *object_path);
-static gboolean battery_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpointer userdata);
-static gboolean battery_button_set_icon (BatteryButton *button);
-static gboolean battery_button_press_event (GtkWidget *widget, GdkEventButton *event);
-static void battery_button_show_menu (BatteryButton *button);
-static void battery_button_menu_add_device (BatteryButton *button, BatteryDevice *battery_device, gboolean append);
-static void increase_brightness (BatteryButton *button);
-static void decrease_brightness (BatteryButton *button);
+static void power_manager_button_finalize   (GObject *object);
+static GList* find_device_in_list (PowerManagerButton *button, const gchar *object_path);
+static gboolean power_manager_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpointer userdata);
+static gboolean power_manager_button_set_icon (PowerManagerButton *button);
+static gboolean power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event);
+static void power_manager_button_show_menu (PowerManagerButton *button);
+static void power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice *battery_device, gboolean append);
+static void increase_brightness (PowerManagerButton *button);
+static void decrease_brightness (PowerManagerButton *button);
 
 
 
 static BatteryDevice*
-get_display_device (BatteryButton *button)
+get_display_device (PowerManagerButton *button)
 {
     GList *item = NULL;
     gdouble highest_percentage = 0;
@@ -153,7 +153,7 @@ get_display_device (BatteryButton *button)
 }
 
 static void
-battery_button_set_tooltip (BatteryButton *button)
+power_manager_button_set_tooltip (PowerManagerButton *button)
 {
     BatteryDevice *display_device = get_display_device (button);
 
@@ -170,13 +170,13 @@ battery_button_set_tooltip (BatteryButton *button)
 }
 
 static GList*
-find_device_in_list (BatteryButton *button, const gchar *object_path)
+find_device_in_list (PowerManagerButton *button, const gchar *object_path)
 {
     GList *item = NULL;
 
     TRACE("entering");
 
-    g_return_val_if_fail ( BATTERY_IS_BUTTON(button), NULL );
+    g_return_val_if_fail ( POWER_MANAGER_IS_BUTTON(button), NULL );
 
     for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
     {
@@ -189,7 +189,7 @@ find_device_in_list (BatteryButton *button, const gchar *object_path)
 }
 
 static gboolean
-battery_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpointer userdata)
+power_manager_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpointer userdata)
 {
     cairo_t *cr;
     UpDevice *device = UP_DEVICE(userdata);
@@ -250,7 +250,7 @@ battery_button_device_icon_expose (GtkWidget *img, GdkEventExpose *event, gpoint
 
 
 static void
-battery_button_update_device_icon_and_details (BatteryButton *button, UpDevice *device)
+power_manager_button_update_device_icon_and_details (PowerManagerButton *button, UpDevice *device)
 {
     GList *item;
     BatteryDevice *battery_device, *display_device;
@@ -261,7 +261,7 @@ battery_button_update_device_icon_and_details (BatteryButton *button, UpDevice *
 
     TRACE("entering for %s", object_path);
 
-    g_return_if_fail ( BATTERY_IS_BUTTON (button) );
+    g_return_if_fail ( POWER_MANAGER_IS_BUTTON (button) );
 
     item = find_device_in_list (button, object_path);
 
@@ -300,9 +300,9 @@ battery_button_update_device_icon_and_details (BatteryButton *button, UpDevice *
 	/* it is! update the panel button */
 	g_free(button->priv->panel_icon_name);
 	button->priv->panel_icon_name = icon_name;
-	battery_button_set_icon (button);
+	power_manager_button_set_icon (button);
 	/* update tooltip */
-	battery_button_set_tooltip (button);
+	power_manager_button_set_tooltip (button);
     }
 
     /* If the menu is being displayed, update it */
@@ -315,22 +315,22 @@ battery_button_update_device_icon_and_details (BatteryButton *button, UpDevice *
         /* update the image */
         img = gtk_image_new_from_pixbuf(battery_device->pix);
         gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(battery_device->menu_item), img);
-        g_signal_connect_after (G_OBJECT (img), "expose-event", G_CALLBACK (battery_button_device_icon_expose), device);
+        g_signal_connect_after (G_OBJECT (img), "expose-event", G_CALLBACK (power_manager_button_device_icon_expose), device);
     }
 }
 
 static void
 #if UP_CHECK_VERSION(0, 99, 0)
-device_changed_cb (UpDevice *device, GParamSpec *pspec, BatteryButton *button)
+device_changed_cb (UpDevice *device, GParamSpec *pspec, PowerManagerButton *button)
 #else
-device_changed_cb (UpDevice *device, BatteryButton *button)
+device_changed_cb (UpDevice *device, PowerManagerButton *button)
 #endif
 {
-    battery_button_update_device_icon_and_details (button, device);
+    power_manager_button_update_device_icon_and_details (button, device);
 }
 
 static void
-battery_button_add_device (UpDevice *device, BatteryButton *button)
+power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
 {
     BatteryDevice *battery_device;
     guint type = 0;
@@ -339,7 +339,7 @@ battery_button_add_device (UpDevice *device, BatteryButton *button)
 
     TRACE("entering for %s", object_path);
 
-    g_return_if_fail ( BATTERY_IS_BUTTON (button ) );
+    g_return_if_fail ( POWER_MANAGER_IS_BUTTON (button ) );
 
     /* don't add the same device twice */
     if ( find_device_in_list (button, object_path) )
@@ -368,17 +368,17 @@ battery_button_add_device (UpDevice *device, BatteryButton *button)
     button->priv->devices = g_list_append (button->priv->devices, battery_device);
 
     /* Add the icon and description for the device */
-    battery_button_update_device_icon_and_details (button, device);
+    power_manager_button_update_device_icon_and_details (button, device);
 
     /* If the menu is being shown, add this new device to it */
     if (button->priv->menu)
     {
-	battery_button_menu_add_device (button, battery_device, FALSE);
+	power_manager_button_menu_add_device (button, battery_device, FALSE);
     }
 }
 
 static void
-battery_button_remove_device (BatteryButton *button, const gchar *object_path)
+power_manager_button_remove_device (PowerManagerButton *button, const gchar *object_path)
 {
     GList *item;
     BatteryDevice *battery_device;
@@ -414,28 +414,28 @@ battery_button_remove_device (BatteryButton *button, const gchar *object_path)
 }
 
 static void
-device_added_cb (UpClient *upower, UpDevice *device, BatteryButton *button)
+device_added_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
 {
-    battery_button_add_device (device, button);
+    power_manager_button_add_device (device, button);
 }
 
 #if UP_CHECK_VERSION(0, 99, 0)
 static void
-device_removed_cb (UpClient *upower, const gchar *object_path, BatteryButton *button)
+device_removed_cb (UpClient *upower, const gchar *object_path, PowerManagerButton *button)
 {
-    battery_button_remove_device (button, object_path);
+    power_manager_button_remove_device (button, object_path);
 }
 #else
 static void
-device_removed_cb (UpClient *upower, UpDevice *device, BatteryButton *button)
+device_removed_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
 {
     const gchar *object_path = up_device_get_object_path(device);
-    battery_button_remove_device (button, object_path);
+    power_manager_button_remove_device (button, object_path);
 }
 #endif
 
 static void
-battery_button_add_all_devices (BatteryButton *button)
+power_manager_button_add_all_devices (PowerManagerButton *button)
 {
 #if !UP_CHECK_VERSION(0, 99, 0)
     /* the device-add callback is called for each device */
@@ -445,7 +445,7 @@ battery_button_add_all_devices (BatteryButton *button)
     guint i;
 
     button->priv->display_device = up_client_get_display_device (button->priv->upower);
-    battery_button_add_device (button->priv->display_device, button);
+    power_manager_button_add_device (button->priv->display_device, button);
 
     array = up_client_get_devices(button->priv->upower);
 
@@ -455,7 +455,7 @@ battery_button_add_all_devices (BatteryButton *button)
 	{
 	    UpDevice *device = g_ptr_array_index (array, i);
 
-	    battery_button_add_device (device, button);
+	    power_manager_button_add_device (device, button);
 	}
 	g_ptr_array_free (array, TRUE);
     }
@@ -463,7 +463,7 @@ battery_button_add_all_devices (BatteryButton *button)
 }
 
 static void
-brightness_up (BatteryButton *button)
+brightness_up (PowerManagerButton *button)
 {
     gint32 level;
     gint32 max_level;
@@ -478,7 +478,7 @@ brightness_up (BatteryButton *button)
 }
 
 static void
-brightness_down (BatteryButton *button)
+brightness_down (PowerManagerButton *button)
 {
     gint32 level;
     xfpm_brightness_get_level (button->priv->brightness, &level);
@@ -490,12 +490,12 @@ brightness_down (BatteryButton *button)
 }
 
 static gboolean
-battery_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
+power_manager_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
 {
     gboolean hw_found;
-    BatteryButton *button;
+    PowerManagerButton *button;
 
-    button = BATTERY_BUTTON (widget);
+    button = POWER_MANAGER_BUTTON (widget);
 
     hw_found = xfpm_brightness_has_hw (button->priv->brightness);
 
@@ -516,25 +516,25 @@ battery_button_scroll_event (GtkWidget *widget, GdkEventScroll *ev)
 }
 
 static void
-battery_button_class_init (BatteryButtonClass *klass)
+power_manager_button_class_init (PowerManagerButtonClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    object_class->finalize = battery_button_finalize;
+    object_class->finalize = power_manager_button_finalize;
 
-    widget_class->button_press_event = battery_button_press_event;
-    widget_class->scroll_event = battery_button_scroll_event;
+    widget_class->button_press_event = power_manager_button_press_event;
+    widget_class->scroll_event = power_manager_button_scroll_event;
 
-    g_type_class_add_private (klass, sizeof (BatteryButtonPrivate));
+    g_type_class_add_private (klass, sizeof (PowerManagerButtonPrivate));
 }
 
 static void
-battery_button_init (BatteryButton *button)
+power_manager_button_init (PowerManagerButton *button)
 {
     GError *error = NULL;
 
-    button->priv = BATTERY_BUTTON_GET_PRIVATE (button);
+    button->priv = POWER_MANAGER_BUTTON_GET_PRIVATE (button);
 
     gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
     gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
@@ -565,11 +565,11 @@ battery_button_init (BatteryButton *button)
 }
 
 static void
-battery_button_finalize (GObject *object)
+power_manager_button_finalize (GObject *object)
 {
-    BatteryButton *button;
+    PowerManagerButton *button;
 
-    button = BATTERY_BUTTON (object);
+    button = POWER_MANAGER_BUTTON (object);
 
     g_free(button->priv->panel_icon_name);
 
@@ -585,19 +585,19 @@ battery_button_finalize (GObject *object)
     g_object_unref (button->priv->plugin);
 #endif
 
-    G_OBJECT_CLASS (battery_button_parent_class)->finalize (object);
+    G_OBJECT_CLASS (power_manager_button_parent_class)->finalize (object);
 }
 
 GtkWidget *
 #ifdef XFCE_PLUGIN
-battery_button_new (XfcePanelPlugin *plugin)
+power_manager_button_new (XfcePanelPlugin *plugin)
 #endif
 #ifdef LXDE_PLUGIN
-battery_button_new (Plugin *plugin)
+power_manager_button_new (Plugin *plugin)
 #endif
 {
-    BatteryButton *button = NULL;
-    button = g_object_new (BATTERY_TYPE_BUTTON, NULL, NULL);
+    PowerManagerButton *button = NULL;
+    button = g_object_new (POWER_MANAGER_TYPE_BUTTON, NULL, NULL);
 
 #ifdef XFCE_PLUGIN
     button->priv->plugin = XFCE_PANEL_PLUGIN (g_object_ref (plugin));
@@ -610,7 +610,7 @@ battery_button_new (Plugin *plugin)
 }
 
 static gboolean
-battery_button_set_icon (BatteryButton *button)
+power_manager_button_set_icon (PowerManagerButton *button)
 {
     GdkPixbuf *pixbuf;
 
@@ -633,34 +633,34 @@ battery_button_set_icon (BatteryButton *button)
 }
 
 void
-battery_button_set_width (BatteryButton *button, gint width)
+power_manager_button_set_width (PowerManagerButton *button, gint width)
 {
-    g_return_if_fail (BATTERY_IS_BUTTON (button));
+    g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
 
     button->priv->panel_icon_width = width;
 
-    battery_button_set_icon (button);
+    power_manager_button_set_icon (button);
 }
 
 static gboolean
-battery_button_press_event (GtkWidget *widget, GdkEventButton *event)
+power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event)
 {
-    BatteryButton *button = BATTERY_BUTTON (widget);
+    PowerManagerButton *button = POWER_MANAGER_BUTTON (widget);
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
-    battery_button_show_menu (button);
+    power_manager_button_show_menu (button);
     return TRUE;
 }
 
 #ifdef XFCE_PLUGIN
 static gboolean
-battery_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, BatteryButton *button)
+power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button)
 {
     gint width;
     gint xthickness;
     gint ythickness;
 
-    g_return_val_if_fail (BATTERY_IS_BUTTON (button), FALSE);
+    g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
     g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
 
     xthickness = gtk_widget_get_style(GTK_WIDGET(button))->xthickness;
@@ -671,18 +671,18 @@ battery_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, BatteryButto
     gtk_widget_set_size_request (GTK_WIDGET(plugin), size + xthickness, size + ythickness);
     button->priv->panel_icon_width = width;
 
-    return battery_button_set_icon (button);
+    return power_manager_button_set_icon (button);
 }
 
 static void
-battery_button_style_set_cb (XfcePanelPlugin *plugin, GtkStyle *prev_style, BatteryButton *button)
+power_manager_button_style_set_cb (XfcePanelPlugin *plugin, GtkStyle *prev_style, PowerManagerButton *button)
 {
     gtk_widget_reset_rc_styles (GTK_WIDGET (plugin));
-    battery_button_size_changed_cb (plugin, xfce_panel_plugin_get_size (plugin), button);
+    power_manager_button_size_changed_cb (plugin, xfce_panel_plugin_get_size (plugin), button);
 }
 
 static void
-battery_button_free_data_cb (XfcePanelPlugin *plugin, BatteryButton *button)
+power_manager_button_free_data_cb (XfcePanelPlugin *plugin, PowerManagerButton *button)
 {
     gtk_widget_destroy (GTK_WIDGET (button));
 }
@@ -695,11 +695,11 @@ help_cb (GtkMenuItem *menuitem, gpointer user_data)
 }
 
 void
-battery_button_show (BatteryButton *button)
+power_manager_button_show (PowerManagerButton *button)
 {
     GtkWidget *mi;
 
-    g_return_if_fail (BATTERY_IS_BUTTON (button));
+    g_return_if_fail (POWER_MANAGER_IS_BUTTON (button));
 
 #ifdef XFCE_PLUGIN
     xfce_panel_plugin_add_action_widget (button->priv->plugin, GTK_WIDGET (button));
@@ -719,26 +719,26 @@ battery_button_show (BatteryButton *button)
     xfce_panel_plugin_menu_insert_item (button->priv->plugin, GTK_MENU_ITEM (mi));
 
     g_signal_connect (button->priv->plugin, "size-changed",
-                      G_CALLBACK (battery_button_size_changed_cb), button);
+                      G_CALLBACK (power_manager_button_size_changed_cb), button);
 
     g_signal_connect (button->priv->plugin, "style-set",
-                      G_CALLBACK (battery_button_style_set_cb), button);
+                      G_CALLBACK (power_manager_button_style_set_cb), button);
 
     g_signal_connect (button->priv->plugin, "free-data",
-                      G_CALLBACK (battery_button_free_data_cb), button);
+                      G_CALLBACK (power_manager_button_free_data_cb), button);
 #endif
 
     gtk_widget_show_all (GTK_WIDGET(button));
-    battery_button_set_tooltip (button);
+    power_manager_button_set_tooltip (button);
 
     /* Add all the devcies currently attached to the system */
-    battery_button_add_all_devices (button);
+    power_manager_button_add_all_devices (button);
 }
 
 static void
 menu_destroyed_cb(GtkMenuShell *menu, gpointer user_data)
 {
-    BatteryButton *button = BATTERY_BUTTON (user_data);
+    PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
 
     TRACE("entering");
 
@@ -754,7 +754,7 @@ menu_destroyed_cb(GtkMenuShell *menu, gpointer user_data)
 static void
 menu_item_destroyed_cb(GtkWidget *object, gpointer user_data)
 {
-    BatteryButton *button = BATTERY_BUTTON (user_data);
+    PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
     GList *item;
 
     for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
@@ -772,7 +772,7 @@ menu_item_destroyed_cb(GtkWidget *object, gpointer user_data)
 static void
 menu_item_activate_cb(GtkWidget *object, gpointer user_data)
 {
-    BatteryButton *button = BATTERY_BUTTON (user_data);
+    PowerManagerButton *button = POWER_MANAGER_BUTTON (user_data);
     GList *item;
 
     for (item = g_list_first (button->priv->devices); item != NULL; item = g_list_next (item))
@@ -789,7 +789,7 @@ menu_item_activate_cb(GtkWidget *object, gpointer user_data)
 }
 
 static void
-battery_button_menu_add_device (BatteryButton *button, BatteryDevice *battery_device, gboolean append)
+power_manager_button_menu_add_device (PowerManagerButton *button, BatteryDevice *battery_device, gboolean append)
 {
     GtkWidget *mi, *label, *img;
     guint type = 0;
@@ -817,7 +817,7 @@ battery_button_menu_add_device (BatteryButton *button, BatteryDevice *battery_de
     /* keep track of the menu item in the battery_device so we can update it */
     battery_device->menu_item = mi;
     g_signal_connect(G_OBJECT(mi), "destroy", G_CALLBACK(menu_item_destroyed_cb), button);
-    g_signal_connect_after (G_OBJECT (img), "expose-event", G_CALLBACK (battery_button_device_icon_expose), battery_device->device);
+    g_signal_connect_after (G_OBJECT (img), "expose-event", G_CALLBACK (power_manager_button_device_icon_expose), battery_device->device);
 
     /* Active calls xfpm settings with the device's id to display details */
     g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menu_item_activate_cb), button);
@@ -831,7 +831,7 @@ battery_button_menu_add_device (BatteryButton *button, BatteryDevice *battery_de
 }
 
 static void
-decrease_brightness (BatteryButton *button)
+decrease_brightness (PowerManagerButton *button)
 {
     gint32 level;
 
@@ -851,7 +851,7 @@ decrease_brightness (BatteryButton *button)
 }
 
 static void
-increase_brightness (BatteryButton *button)
+increase_brightness (PowerManagerButton *button)
 {
     gint32 level, max_level;
 
@@ -872,7 +872,7 @@ increase_brightness (BatteryButton *button)
 }
 
 static gboolean
-brightness_set_level_with_timeout (BatteryButton *button)
+brightness_set_level_with_timeout (PowerManagerButton *button)
 {
     gint32 range_level, hw_level;
 
@@ -897,7 +897,7 @@ brightness_set_level_with_timeout (BatteryButton *button)
 }
 
 static void
-range_value_changed_cb (BatteryButton *button, GtkWidget *widget)
+range_value_changed_cb (PowerManagerButton *button, GtkWidget *widget)
 {
     TRACE("entering");
 
@@ -910,7 +910,7 @@ range_value_changed_cb (BatteryButton *button, GtkWidget *widget)
 }
 
 static void
-range_scroll_cb (GtkWidget *widget, GdkEvent *event, BatteryButton *button)
+range_scroll_cb (GtkWidget *widget, GdkEvent *event, PowerManagerButton *button)
 {
     GdkEventScroll *scroll_event;
 
@@ -925,7 +925,7 @@ range_scroll_cb (GtkWidget *widget, GdkEvent *event, BatteryButton *button)
 }
 
 static void
-range_show_cb (GtkWidget *widget, BatteryButton *button)
+range_show_cb (GtkWidget *widget, PowerManagerButton *button)
 {
     TRACE("entering");
     /* Release these grabs they will cause a lockup if pkexec is called
@@ -936,7 +936,7 @@ range_show_cb (GtkWidget *widget, BatteryButton *button)
 }
 
 static void
-battery_button_show_menu (BatteryButton *button)
+power_manager_button_show_menu (PowerManagerButton *button)
 {
     GtkWidget *menu, *mi, *img = NULL;
     GdkScreen *gscreen;
@@ -959,7 +959,7 @@ battery_button_show_menu (BatteryButton *button)
     {
         BatteryDevice *battery_device = item->data;
 
-        battery_button_menu_add_device (button, battery_device, TRUE);
+        power_manager_button_menu_add_device (button, battery_device, TRUE);
         /* If we add an item to the menu, show the separator */
         show_separator_flag = TRUE;
     }
diff --git a/panel-plugins/battery/battery-button.h b/panel-plugins/power-manager-plugin/power-manager-button.h
similarity index 53%
rename from panel-plugins/battery/battery-button.h
rename to panel-plugins/power-manager-plugin/power-manager-button.h
index 171ce9f..8ba10c7 100644
--- a/panel-plugins/battery/battery-button.h
+++ b/panel-plugins/power-manager-plugin/power-manager-button.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __BATTERY_BUTTON_H
-#define __BATTERY_BUTTON_H
+#ifndef __POWER_MANAGER_BUTTON_H
+#define __POWER_MANAGER_BUTTON_H
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -32,38 +32,38 @@
 
 G_BEGIN_DECLS
 
-#define BATTERY_TYPE_BUTTON        (battery_button_get_type () )
-#define BATTERY_BUTTON(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), BATTERY_TYPE_BUTTON, BatteryButton))
-#define BATTERY_IS_BUTTON(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), BATTERY_TYPE_BUTTON))
+#define POWER_MANAGER_TYPE_BUTTON        (power_manager_button_get_type () )
+#define POWER_MANAGER_BUTTON(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), POWER_MANAGER_TYPE_BUTTON, PowerManagerButton))
+#define POWER_MANAGER_IS_BUTTON(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), POWER_MANAGER_TYPE_BUTTON))
 
-typedef struct BatteryButtonPrivate BatteryButtonPrivate;
+typedef struct PowerManagerButtonPrivate PowerManagerButtonPrivate;
 
 typedef struct
 {
-    GtkToggleButton           parent;
-    BatteryButtonPrivate     *priv;
+    GtkToggleButton            parent;
+    PowerManagerButtonPrivate *priv;
 
-} BatteryButton;
+} PowerManagerButton;
 
 typedef struct
 {
     GtkToggleButtonClass parent_class;
 
-} BatteryButtonClass;
+} PowerManagerButtonClass;
 
-GType                    battery_button_get_type (void) G_GNUC_CONST;
+GType                    power_manager_button_get_type (void) G_GNUC_CONST;
 
 #ifdef XFCE_PLUGIN
-GtkWidget               *battery_button_new       (XfcePanelPlugin *plugin);
+GtkWidget               *power_manager_button_new       (XfcePanelPlugin *plugin);
 #endif
 #ifdef LXDE_PLUGIN
-GtkWidget               *battery_button_new       (Plugin *plugin);
+GtkWidget               *power_manager_button_new       (Plugin *plugin);
 #endif
 
-void                     battery_button_show      (BatteryButton *button);
+void                     power_manager_button_show      (PowerManagerButton *button);
 
-void                     battery_button_set_width (BatteryButton *button, gint width);
+void                     power_manager_button_set_width (PowerManagerButton *button, gint width);
 
 G_END_DECLS
 
-#endif /* __BATTERY_BUTTON_H */
+#endif /* __POWER_MANAGER_BUTTON_H */
diff --git a/panel-plugins/battery/scalemenuitem.c b/panel-plugins/power-manager-plugin/scalemenuitem.c
similarity index 100%
rename from panel-plugins/battery/scalemenuitem.c
rename to panel-plugins/power-manager-plugin/scalemenuitem.c
diff --git a/panel-plugins/battery/scalemenuitem.h b/panel-plugins/power-manager-plugin/scalemenuitem.h
similarity index 100%
rename from panel-plugins/battery/scalemenuitem.h
rename to panel-plugins/power-manager-plugin/scalemenuitem.h
diff --git a/panel-plugins/battery/xfce/Makefile.am b/panel-plugins/power-manager-plugin/xfce/Makefile.am
similarity index 81%
rename from panel-plugins/battery/xfce/Makefile.am
rename to panel-plugins/power-manager-plugin/xfce/Makefile.am
index a2746ed..188116d 100644
--- a/panel-plugins/battery/xfce/Makefile.am
+++ b/panel-plugins/power-manager-plugin/xfce/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"xfce4-battery-plugin\" \
+	-DG_LOG_DOMAIN=\"xfce4-power-manager-plugin\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
@@ -8,19 +8,19 @@ AM_CPPFLAGS = \
 # xfce4 battery plugin
 #
 plugin_LTLIBRARIES = \
-	libxfce4battery.la
+	libxfce4powermanager.la
 
 plugindir = \
 	$(libdir)/xfce4/panel/plugins
 
-libxfce4battery_la_SOURCES = \
-	battery-plugin.c         \
-	../battery-button.c      \
-	../battery-button.h      \
+libxfce4powermanager_la_SOURCES = \
+	xfce-power-manager-plugin.c         \
+	../power-manager-button.c      \
+	../power-manager-button.h      \
 	../scalemenuitem.c       \
 	../scalemenuitem.h
 
-libxfce4battery_la_CFLAGS =         \
+libxfce4powermanager_la_CFLAGS =         \
 	-I$(top_srcdir)	                \
 	-I$(top_srcdir)/src             \
 	-DLOCALEDIR=\"$(localedir)\"    \
@@ -36,14 +36,14 @@ libxfce4battery_la_CFLAGS =         \
 	$(DBUS_GLIB_CFLAGS)             \
 	$(UPOWER_CFLAGS)
 
-libxfce4battery_la_LDFLAGS = \
+libxfce4powermanager_la_LDFLAGS = \
        -avoid-version \
        -module \
        -no-undefined \
        -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
        $(PLATFORM_LDFLAGS)
 
-libxfce4battery_la_LIBADD =                     \
+libxfce4powermanager_la_LIBADD =                     \
 	$(top_builddir)/common/libxfpmcommon.la \
 	$(LIBXFCE4PANEL_LIBS)                   \
 	$(LIBXFCE4UI_LIBS)                      \
@@ -58,7 +58,7 @@ libxfce4battery_la_LIBADD =                     \
 # Desktop file
 #
 desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = xfce4-battery-plugin.desktop.in.in
+desktop_in_in_files = power-manager-plugin.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
diff --git a/panel-plugins/power-manager-plugin/xfce/power-manager-plugin.desktop.in.in b/panel-plugins/power-manager-plugin/xfce/power-manager-plugin.desktop.in.in
new file mode 100644
index 0000000..57a719f
--- /dev/null
+++ b/panel-plugins/power-manager-plugin/xfce/power-manager-plugin.desktop.in.in
@@ -0,0 +1,8 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+_Name=Power Manager Plugin
+_Comment=Display the battery levels of your devices and control the brightness of your display
+Icon=xfpm-primary-100-charging
+X-XFCE-Module=xfce4powermanager
+X-XFCE-Unique=TRUE
+X-XFCE-Internal=false
diff --git a/panel-plugins/battery/xfce/battery-plugin.c b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
similarity index 55%
rename from panel-plugins/battery/xfce/battery-plugin.c
rename to panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
index 84cc5de..f060c67 100644
--- a/panel-plugins/battery/xfce/battery-plugin.c
+++ b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
@@ -35,7 +35,7 @@
 #include <libxfce4panel/xfce-panel-plugin.h>
 #endif
 
-#include "../battery-button.h"
+#include "../power-manager-button.h"
 
 /* plugin structure */
 typedef struct
@@ -44,49 +44,49 @@ typedef struct
 
     /* panel widgets */
     GtkWidget       *ebox;
-    GtkWidget       *battery_button;
+    GtkWidget       *power_manager_button;
 }
-BatteryPlugin;
+PowerManagerPlugin;
 
 
 /* prototypes */
-static void battery_plugin_construct (XfcePanelPlugin *plugin);
+static void power_manager_plugin_construct (XfcePanelPlugin *plugin);
 /* register the plugin */
-XFCE_PANEL_PLUGIN_REGISTER (battery_plugin_construct);
+XFCE_PANEL_PLUGIN_REGISTER (power_manager_plugin_construct);
 
 
-static BatteryPlugin *
-battery_plugin_new (XfcePanelPlugin *plugin)
+static PowerManagerPlugin *
+power_manager_plugin_new (XfcePanelPlugin *plugin)
 {
-    BatteryPlugin *battery_plugin;
+    PowerManagerPlugin *power_manager_plugin;
 
     /* allocate memory for the plugin structure */
-    battery_plugin = panel_slice_new0 (BatteryPlugin);
+    power_manager_plugin = panel_slice_new0 (PowerManagerPlugin);
 
     /* pointer to plugin */
-    battery_plugin->plugin = plugin;
+    power_manager_plugin->plugin = plugin;
 
     /* create some panel ebox */
-    battery_plugin->ebox = gtk_event_box_new ();
-    gtk_widget_show (battery_plugin->ebox);
-    gtk_event_box_set_visible_window (GTK_EVENT_BOX(battery_plugin->ebox), FALSE);
+    power_manager_plugin->ebox = gtk_event_box_new ();
+    gtk_widget_show (power_manager_plugin->ebox);
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE);
 
-    battery_plugin->battery_button = battery_button_new (plugin);
-    battery_button_show(BATTERY_BUTTON(battery_plugin->battery_button));
-    gtk_container_add (GTK_CONTAINER (battery_plugin->ebox), battery_plugin->battery_button);
+    power_manager_plugin->power_manager_button = power_manager_button_new (plugin);
+    power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button));
+    gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button);
 
-    return battery_plugin;
+    return power_manager_plugin;
 }
 
 
 static void
-battery_plugin_construct (XfcePanelPlugin *plugin)
+power_manager_plugin_construct (XfcePanelPlugin *plugin)
 {
-    BatteryPlugin *battery_plugin;
+    PowerManagerPlugin *power_manager_plugin;
 
     /* create the plugin */
-    battery_plugin = battery_plugin_new (plugin);
+    power_manager_plugin = power_manager_plugin_new (plugin);
 
     /* add the ebox to the panel */
-    gtk_container_add (GTK_CONTAINER (plugin), battery_plugin->ebox);
+    gtk_container_add (GTK_CONTAINER (plugin), power_manager_plugin->ebox);
 }

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


More information about the Xfce4-commits mailing list