diff options
| author | Ali Abdallah <ali.slackware@gmail.com> | 2009-06-06 12:22:30 +0000 |
|---|---|---|
| committer | Ali Abdallah <ali.slackware@gmail.com> | 2009-06-06 12:22:30 +0000 |
| commit | c400d161ce6c47ccd7da2daf7ca079f3a48bf371 (patch) | |
| tree | 32017c9d76d5c37471bfe2c29a0e77868b7f441b | |
| parent | 29c37191369414e97cee44564d389f038d4b7b6e (diff) | |
| download | ixfce4-power-manager-c400d161ce6c47ccd7da2daf7ca079f3a48bf371.tar.gz | |
*: Use the channel in the private data.
*: Don't show popup message if xfmp is already running and
a new instance is trying to load for some reason.
(Old svn revision: 7470)
| -rw-r--r-- | AUTHORS | 8 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfpm-main.c | 7 | ||||
| -rw-r--r-- | src/xfpm-xfconf.c | 3 | ||||
| -rw-r--r-- | src/xfpm-xfconf.h | 3 |
5 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,7 @@ -Ali Abdallah aliov@xfce.org +Ali Abdallah aliov@xfce.org -Special Thanks to Fabian Nowak.
\ No newline at end of file +Special Thanks to: +------------------ +* Yves-Alexis Perez corsac@debian.org. +* Mike Masonnet mmassonnet@xfce.org. +* Fabian Nowak timystery@arcor.de. @@ -1,3 +1,8 @@ +2009-06-04: 15:00 Ali aliov@xfce.org + *: Use the channel in the private data. + *: Don't show popup message if xfmp is already running and + a new instance is trying to load for some reason. + 2009-06-04: 12:00 Ali aliov@xfce.org *: Reset the idle counter when we switch from battery to AC and vise versa. diff --git a/src/xfpm-main.c b/src/xfpm-main.c index 10849761..725b0572 100644 --- a/src/xfpm-main.c +++ b/src/xfpm-main.c @@ -267,9 +267,10 @@ int main(int argc, char **argv) if (xfpm_dbus_name_has_owner (dbus_g_connection_get_connection(bus), "org.freedesktop.PowerManagement") ) { - - xfpm_info(_("Xfce Power Manager"), - _("Another power manager is already running")); + g_print ("%s: %s\n", + _("Xfce Power Manager"), + _("Another power manager is already running")); + } else if (xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager")) diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c index ce52852a..e44b8797 100644 --- a/src/xfpm-xfconf.c +++ b/src/xfpm-xfconf.c @@ -29,6 +29,8 @@ #include <glib.h> #include <libxfce4util/libxfce4util.h> +#include <xfconf/xfconf.h> + #include "libxfpm/xfpm-string.h" #include "libxfpm/xfpm-common.h" @@ -600,7 +602,6 @@ xfpm_xfconf_init (XfpmXfconf *conf) G_CALLBACK (xfpm_xfconf_property_changed_cb), conf); xfpm_xfconf_load_configuration (conf); } - conf->channel = xfconf_channel_new ("xfce4-power-manager"); } static void diff --git a/src/xfpm-xfconf.h b/src/xfpm-xfconf.h index 9055fc5e..c4d6b9f2 100644 --- a/src/xfpm-xfconf.h +++ b/src/xfpm-xfconf.h @@ -23,8 +23,6 @@ #include <glib-object.h> -#include <xfconf/xfconf.h> - G_BEGIN_DECLS #define XFPM_TYPE_XFCONF (xfpm_xfconf_get_type () ) @@ -36,7 +34,6 @@ typedef struct XfpmXfconfPrivate XfpmXfconfPrivate; typedef struct { GObject parent; - XfconfChannel *channel; XfpmXfconfPrivate *priv; } XfpmXfconf; |