[Goodies-commits] r5822 - in xfce4-power-manager/trunk: . po src
Ali Abdallah
aliov at xfce.org
Sun Oct 26 23:40:11 CET 2008
Author: aliov
Date: 2008-10-26 22:40:11 +0000 (Sun, 26 Oct 2008)
New Revision: 5822
Modified:
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/po/xfce4-power-manager.pot
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfpm-battery-icon.c
xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
xfce4-power-manager/trunk/src/xfpm-hal.c
xfce4-power-manager/trunk/src/xfpm-main.c
Log:
Added libxfce4util dependency
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/configure.ac.in 2008-10-26 22:40:11 UTC (rev 5822)
@@ -40,6 +40,7 @@
m4_define([hal_minimum_version], [0.5.6])
m4_define([xfconf_minimum_version], [4.5.90])
m4_define([libxfcegui4_minimum_version],[4.4.1])
+m4_define([libxfce4util_minimum_version],[4.4.1])
m4_define([dbus_glib_minimum_version], [0.70])
m4_define([libnotify_minimum_version], [0.4.1])
@@ -50,8 +51,8 @@
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0],[xfconf_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCEGUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCEUTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
-
#=======================================================#
# Check for DPMS support #
#=======================================================#
Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2008-10-26 22:40:11 UTC (rev 5822)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 10:26+0100\n"
+"POT-Creation-Date: 2008-10-26 23:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -28,128 +28,128 @@
msgid "Adapter is offline"
msgstr ""
-#: xfpm-ac-adapter.c:357 xfpm-battery.c:922
+#: xfpm-ac-adapter.c:357 xfpm-battery.c:907
msgid "Are you sure you want to hibernate the system ?"
msgstr ""
-#: xfpm-ac-adapter.c:359 xfpm-ac-adapter.c:395 xfpm-battery.c:817
-#: xfpm-battery.c:924 xfpm-battery.c:959 xfpm-settings.c:465
+#: xfpm-ac-adapter.c:359 xfpm-ac-adapter.c:395 xfpm-battery.c:802
+#: xfpm-battery.c:909 xfpm-battery.c:944 xfpm-settings.c:465
#: xfpm-settings.c:932 xfpm-settings.c:961 xfpm-settings.c:984
msgid "Hibernate"
msgstr ""
-#: xfpm-ac-adapter.c:371 xfpm-battery.c:937
+#: xfpm-ac-adapter.c:371 xfpm-battery.c:922
msgid "Are you sure you want to suspend the system ?"
msgstr ""
-#: xfpm-ac-adapter.c:373 xfpm-ac-adapter.c:412 xfpm-battery.c:939
-#: xfpm-battery.c:974 xfpm-settings.c:930 xfpm-settings.c:959
+#: xfpm-ac-adapter.c:373 xfpm-ac-adapter.c:412 xfpm-battery.c:924
+#: xfpm-battery.c:959 xfpm-settings.c:930 xfpm-settings.c:959
#: xfpm-settings.c:982
msgid "Suspend"
msgstr ""
-#: xfpm-battery-icon.c:337
+#: xfpm-battery-icon.c:351
msgid "Your battery charge is low"
msgstr ""
-#: xfpm-battery-icon.c:344
+#: xfpm-battery-icon.c:358
msgid "Your battery is almost empty"
msgstr ""
-#: xfpm-battery-icon.c:353
+#: xfpm-battery-icon.c:367
msgid "You are running on Battery"
msgstr ""
-#: xfpm-battery-icon.c:353 xfpm-battery-icon.c:535 xfpm-battery-icon.c:539
+#: xfpm-battery-icon.c:367 xfpm-battery-icon.c:549 xfpm-battery-icon.c:553
msgid "Battery is discharging"
msgstr ""
-#: xfpm-battery-icon.c:357
+#: xfpm-battery-icon.c:371
msgid "Your battery is discharging"
msgstr ""
-#: xfpm-battery-icon.c:365 xfpm-battery-icon.c:523
+#: xfpm-battery-icon.c:379 xfpm-battery-icon.c:537
msgid "Battery is charging"
msgstr ""
-#: xfpm-battery-icon.c:374
+#: xfpm-battery-icon.c:388
msgid "Your battery is fully charged"
msgstr ""
-#: xfpm-battery-icon.c:393 xfpm-battery.c:784 xfpm-driver.c:300
+#: xfpm-battery-icon.c:407 xfpm-battery.c:769 xfpm-driver.c:300
#: xfpm-driver.c:888
msgid "Xfce power manager"
msgstr ""
-#: xfpm-battery-icon.c:497
+#: xfpm-battery-icon.c:511
msgid "Not present"
msgstr ""
-#: xfpm-battery-icon.c:503
+#: xfpm-battery-icon.c:517
msgid "%"
msgstr ""
-#: xfpm-battery-icon.c:509
+#: xfpm-battery-icon.c:523
msgid "Battery fully charged"
msgstr ""
-#: xfpm-battery-icon.c:516
+#: xfpm-battery-icon.c:530
msgid "Battery charge level"
msgstr ""
-#: xfpm-battery-icon.c:535
+#: xfpm-battery-icon.c:549
msgid "Running on battery"
msgstr ""
-#: xfpm-battery-icon.c:545
+#: xfpm-battery-icon.c:559
msgid "Battery charge is low"
msgstr ""
-#: xfpm-battery-icon.c:550
+#: xfpm-battery-icon.c:564
msgid "Battery is almost empty"
msgstr ""
-#: xfpm-battery-icon.c:569
+#: xfpm-battery-icon.c:583
msgid ""
"\n"
"Estimated time left"
msgstr ""
-#: xfpm-battery-icon.c:574
+#: xfpm-battery-icon.c:588
msgid ""
"\n"
"Estimated time to charge"
msgstr ""
-#: xfpm-battery-icon.c:578
+#: xfpm-battery-icon.c:592
msgid "hours"
msgstr ""
-#: xfpm-battery-icon.c:578
+#: xfpm-battery-icon.c:592
msgid "hour"
msgstr ""
-#: xfpm-battery-icon.c:579
+#: xfpm-battery-icon.c:593
msgid "minutes"
msgstr ""
-#: xfpm-battery-icon.c:579
+#: xfpm-battery-icon.c:593
msgid "minute"
msgstr ""
-#: xfpm-battery.c:779
+#: xfpm-battery.c:764
msgid "Your battery is almost empty. save your work to avoid losing data"
msgstr ""
-#: xfpm-battery.c:794
+#: xfpm-battery.c:779
msgid "Shutdown the system"
msgstr ""
-#: xfpm-battery.c:802
+#: xfpm-battery.c:787
msgid "Hibernate the system"
msgstr ""
-#: xfpm-battery.c:824 xfpm-settings.c:461 xfpm-settings.c:934
+#: xfpm-battery.c:809 xfpm-settings.c:461 xfpm-settings.c:934
#: xfpm-settings.c:963 xfpm-settings.c:986
msgid "Shutdown"
msgstr ""
@@ -158,27 +158,27 @@
msgid "Part of the Xfce goodies project"
msgstr ""
-#: xfpm-common.c:96 xfpm-driver.c:1188 xfpm-main.c:88
+#: xfpm-common.c:96 xfpm-driver.c:1188 xfpm-main.c:85
msgid "Xfce4 Power Manager"
msgstr ""
-#: xfpm-dpms-spins.c:48
+#: xfpm-dpms-spins.c:50
msgid "never"
msgstr ""
-#: xfpm-dpms-spins.c:49
+#: xfpm-dpms-spins.c:51
msgid "min"
msgstr ""
-#: xfpm-dpms-spins.c:127
+#: xfpm-dpms-spins.c:129
msgid "Standby after"
msgstr ""
-#: xfpm-dpms-spins.c:135
+#: xfpm-dpms-spins.c:137
msgid "Suspend after"
msgstr ""
-#: xfpm-dpms-spins.c:143
+#: xfpm-dpms-spins.c:145
msgid "Turn off after"
msgstr ""
@@ -189,7 +189,7 @@
"with the hardware abstract layer or the message bus daemon is not running"
msgstr ""
-#: xfpm-driver.c:313 xfpm-main.c:268
+#: xfpm-driver.c:313 xfpm-main.c:265
msgid "Xfce4 power manager"
msgstr ""
@@ -213,74 +213,74 @@
msgid "Failed to load power manager configuration using defaults"
msgstr ""
-#: xfpm-hal.c:640 xfpm-hal.c:729 xfpm-hal.c:822 xfpm-hal.c:871 xfpm-hal.c:921
-#: xfpm-hal.c:973 xfpm-hal.c:1025 xfpm-hal.c:1071
+#: xfpm-hal.c:654 xfpm-hal.c:743 xfpm-hal.c:836 xfpm-hal.c:885 xfpm-hal.c:935
+#: xfpm-hal.c:987 xfpm-hal.c:1039 xfpm-hal.c:1085
msgid "Out of memory"
msgstr ""
-#: xfpm-hal.c:671
+#: xfpm-hal.c:685
msgid "Message Hibernate didn't get a reply"
msgstr ""
-#: xfpm-hal.c:692
+#: xfpm-hal.c:706
msgid "System failed to hibernate"
msgstr ""
-#: xfpm-hal.c:698 xfpm-hal.c:789
+#: xfpm-hal.c:712 xfpm-hal.c:803
msgid "Error occured while trying to suspend"
msgstr ""
-#: xfpm-hal.c:701 xfpm-hal.c:792
+#: xfpm-hal.c:715 xfpm-hal.c:806
msgid "Unknown reply from the message daemon"
msgstr ""
-#: xfpm-hal.c:761
+#: xfpm-hal.c:775
msgid "Message suspend didn't get a reply"
msgstr ""
-#: xfpm-hal.c:783
+#: xfpm-hal.c:797
msgid "System failed to suspend"
msgstr ""
-#: xfpm-hal.c:842
+#: xfpm-hal.c:856
msgid "No reply from HAL daemon to set monitor brightness level"
msgstr ""
-#: xfpm-hal.c:889
+#: xfpm-hal.c:903
msgid "No reply from HAL daemon to get monitor brightness level"
msgstr ""
-#: xfpm-hal.c:939
+#: xfpm-hal.c:953
msgid "No reply from HAL daemon to get available cpu governors"
msgstr ""
-#: xfpm-hal.c:991
+#: xfpm-hal.c:1005
msgid "No reply from HAL daemon to get current cpu governor"
msgstr ""
-#: xfpm-hal.c:1044
+#: xfpm-hal.c:1058
msgid "No reply from HAL daemon to set cpu governor"
msgstr ""
-#: xfpm-hal.c:1090
+#: xfpm-hal.c:1104
msgid "No reply from HAL daemon to set power save profile"
msgstr ""
-#: xfpm-main.c:89
+#: xfpm-main.c:86
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
msgstr ""
-#: xfpm-main.c:221
+#: xfpm-main.c:218
msgid "Xfce4 Power Manager is not running, do you want to launch it now ?"
msgstr ""
-#: xfpm-main.c:223
+#: xfpm-main.c:220
msgid "Run"
msgstr ""
-#: xfpm-main.c:269
+#: xfpm-main.c:266
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/src/Makefile.am 2008-10-26 22:40:11 UTC (rev 5822)
@@ -1,26 +1,3 @@
-INCLUDES = \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(HAL_CFLAGS) \
- $(LIBXFCEGUI_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(DPMS_CFLAGS) \
- -DLOCALEDIR=\"$(localedir)\"
-
-
-LIBS = $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(DBUS_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(LIBXFCEGUI_LIBS) \
- $(HAL_LIBS) \
- $(XFCONF_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(DPMS_LIBS)
-
bin_PROGRAMS = xfce4-power-manager
generated_files = \
@@ -33,7 +10,7 @@
xfce4_power_manager_SOURCES = $(generated_files) \
xfpm-main.c \
xfpm-debug.h \
- xfpm-hal.c \
+ xfpm-hal.c \
xfpm-hal.h \
xfpm-driver.c \
xfpm-driver.h \
@@ -57,8 +34,8 @@
xfpm-dpms.h \
xfpm-dpms-spins.c \
xfpm-dpms-spins.h \
- xfpm-popups.c \
- xfpm-popups.h \
+ xfpm-popups.c \
+ xfpm-popups.h \
xfpm-notify.c \
xfpm-notify.h \
xfpm-enums.h \
@@ -67,6 +44,32 @@
xfpm-common.c \
xfpm-common.h
+xfce4_power_manager_CFLAGS = \
+ -DLOCALEDIR=\"$(localedir)\" \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(HAL_CFLAGS) \
+ $(LIBXFCEGUI_CFLAGS) \
+ $(LIBXFCEUTIL_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(DPMS_CFLAGS)
+
+xfce4_power_manager_LDADD = \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(LIBXFCEGUI_LIBS) \
+ $(LIBXFCEUTIL_LIBS) \
+ $(HAL_LIBS) \
+ $(XFCONF_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(DPMS_LIBS)
+
+
EXTRA_DIST = \
xfpm-marshal.list \
$(generated_files) \
Modified: xfce4-power-manager/trunk/src/xfpm-battery-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery-icon.c 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/src/xfpm-battery-icon.c 2008-10-26 22:40:11 UTC (rev 5822)
@@ -19,11 +19,29 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib.h>
-#include <string.h>
+#include <libxfce4util/libxfce4util.h>
#include "xfpm-battery-icon.h"
#include "xfpm-notify.h"
@@ -31,10 +49,6 @@
#include "xfpm-common.h"
#include "xfpm-enum-types.h"
-#ifndef _
-#define _(x) x
-#endif
-
/* init */
static void xfpm_battery_icon_init(XfpmBatteryIcon *battery_icon);
static void xfpm_battery_icon_class_init(XfpmBatteryIconClass *klass);
Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2008-10-26 22:40:11 UTC (rev 5822)
@@ -19,6 +19,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#ifdef HAVE_STDLIB_H
@@ -37,14 +41,12 @@
#include <unistd.h>
#endif
+#include <libxfce4util/libxfce4util.h>
+
#include "xfpm-dpms-spins.h"
#include "xfpm-spin-button.h"
#include "xfpm-marshal.h"
-#ifndef _
-#define _(x) x
-#endif
-
#define SUFFIX_NEVER _("never")
#define SUFFIX_MIN _("min")
Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-26 22:40:11 UTC (rev 5822)
@@ -19,13 +19,27 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
#include "xfpm-hal.h"
#include "xfpm-debug.h"
#include "xfpm-dbus-messages.h"
@@ -645,7 +659,7 @@
reply = dbus_connection_send_with_reply_and_block(priv->connection,
mess,
- 2000,
+ -1,
&error);
dbus_message_unref(mess);
@@ -736,7 +750,7 @@
dbus_error_init(&error);
reply = dbus_connection_send_with_reply_and_block(priv->connection,
mess,
- 2000,
+ -1,
&error);
dbus_message_unref(mess);
@@ -827,7 +841,7 @@
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
if ( dbus_error_is_set(&error) )
@@ -874,7 +888,7 @@
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
if ( dbus_error_is_set(&error) )
@@ -923,7 +937,7 @@
}
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
@@ -976,7 +990,7 @@
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
if ( dbus_error_is_set(&error) )
@@ -1029,7 +1043,7 @@
dbus_message_append_args(mess,DBUS_TYPE_STRING,&governor,DBUS_TYPE_INVALID);
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
if ( dbus_error_is_set(&error) )
@@ -1075,7 +1089,7 @@
dbus_message_append_args(mess,DBUS_TYPE_BOOLEAN,&power_save,DBUS_TYPE_INVALID);
dbus_error_init(&error);
- reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,2000,&error);
+ reply = dbus_connection_send_with_reply_and_block(priv->connection,mess,-1,&error);
dbus_message_unref(mess);
if ( dbus_error_is_set(&error) )
Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c 2008-10-26 18:58:36 UTC (rev 5821)
+++ xfce4-power-manager/trunk/src/xfpm-main.c 2008-10-26 22:40:11 UTC (rev 5822)
@@ -42,6 +42,7 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
#include "xfpm-driver.h"
@@ -50,10 +51,6 @@
#include "xfpm-popups.h"
#include "xfpm-debug.h"
-#ifndef _
-#define _(x) x
-#endif
-
enum
{
PM_HELP,
More information about the Goodies-commits
mailing list