[Goodies-commits] r7020 - in xfce4-power-manager/trunk: . libxfpm src
Ali Abdallah
aliov at xfce.org
Sun Mar 29 00:43:22 CET 2009
Author: aliov
Date: 2009-03-28 23:43:22 +0000 (Sat, 28 Mar 2009)
New Revision: 7020
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/libxfpm/Makefile.am
xfce4-power-manager/trunk/libxfpm/hal-battery.c
xfce4-power-manager/trunk/libxfpm/hal-iface.c
xfce4-power-manager/trunk/libxfpm/hal-monitor.c
xfce4-power-manager/trunk/libxfpm/xfpm-string.c
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Increase glib version dependency to 2.16
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/ChangeLog 2009-03-28 23:43:22 UTC (rev 7020)
@@ -1,4 +1,7 @@
+2009-03-29 0:43 Ali aliov at xfce.org
+ * : Increase glib version dependency to 2.16
+
2009-03-28 17:19 Ali aliov at xfce.org
* : Handle hald is not running or disconnected
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-03-28 23:43:22 UTC (rev 7020)
@@ -53,7 +53,7 @@
# Check for required packages #
#=====================================================#
m4_define([gtk_minimum_version], [2.10.0])
-m4_define([glib_minimum_version], [2.14.0])
+m4_define([glib_minimum_version], [2.16.0])
m4_define([dbus_minimum_version], [0.60])
m4_define([dbus_glib_minimum_version], [0.70])
Modified: xfce4-power-manager/trunk/libxfpm/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/libxfpm/Makefile.am 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/libxfpm/Makefile.am 2009-03-28 23:43:22 UTC (rev 7020)
@@ -1,38 +1,33 @@
noinst_LTLIBRARIES = \
libxfpmhal.la \
- libxfpmhal_iface.la \
+ libxfpmhalpower.la \
libxfpmcommon.la
libxfpmhal_la_SOURCES = \
- xfpm-string.c \
- xfpm-string.h \
hal-marshal.c \
hal-marshal.h \
hal-monitor.c \
hal-monitor.h \
hal-manager.c \
hal-manager.h \
- hal-power.c \
- hal-power.h \
+ hal-iface.c \
+ hal-iface.h \
hal-device.c \
- hal-device.h \
- hal-battery.c \
- hal-battery.h \
- hal-enum.h
+ hal-device.h
libxfpmhal_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
-libxfpmhal_iface_la_SOURCES = \
- hal-iface.c \
- hal-iface.h \
- xfpm-string.c \
- xfpm-string.h
+libxfpmhalpower_la_SOURCES = \
+ hal-power.c \
+ hal-power.h \
+ hal-battery.c \
+ hal-battery.h \
+ hal-enum.h
-libxfpmhal_iface_la_CFLAGS = \
+libxfpmhalpower_la_CFLAGS = \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
libxfpmcommon_la_SOURCES = \
Modified: xfce4-power-manager/trunk/libxfpm/hal-battery.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-battery.c 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/libxfpm/hal-battery.c 2009-03-28 23:43:22 UTC (rev 7020)
@@ -43,8 +43,6 @@
#include "hal-manager.h"
#include "hal-enum.h"
-#include "xfpm-string.h"
-
/* Init */
static void hal_battery_class_init (HalBatteryClass *klass);
static void hal_battery_init (HalBattery *device);
@@ -350,27 +348,27 @@
static HalDeviceType
hal_battery_type_enum_from_string(const gchar *string)
{
- if ( xfpm_strequal (string, "primary") )
+ if ( !g_strcmp0 (string, "primary") )
{
return HAL_DEVICE_TYPE_PRIMARY;
}
- else if ( xfpm_strequal (string, "ups") )
+ else if ( !g_strcmp0 (string, "ups") )
{
return HAL_DEVICE_TYPE_UPS;
}
- else if ( xfpm_strequal (string, "mouse") )
+ else if ( !g_strcmp0 (string, "mouse") )
{
return HAL_DEVICE_TYPE_MOUSE;
}
- else if ( xfpm_strequal (string, "keyboard") )
+ else if ( !g_strcmp0 (string, "keyboard") )
{
return HAL_DEVICE_TYPE_KEYBOARD;
}
- else if ( xfpm_strequal (string, "camera") )
+ else if ( !g_strcmp0 (string, "camera") )
{
return HAL_DEVICE_TYPE_CAMERA;
}
- else if ( xfpm_strequal (string, "keyboard_mouse") )
+ else if ( !g_strcmp0 (string, "keyboard_mouse") )
{
return HAL_DEVICE_TYPE_KEYBOARD_MOUSE;
}
@@ -455,19 +453,19 @@
static const gchar *
_translate_technology (const gchar *tech)
{
- if ( xfpm_strequal (tech, "lithium-ion") )
+ if ( !g_strcmp0 (tech, "lithium-ion") )
{
return _("Lithium ion");
}
- else if ( xfpm_strequal (tech, "lead-acid") )
+ else if ( !g_strcmp0 (tech, "lead-acid") )
{
return _("Lead acid");
}
- else if ( xfpm_strequal (tech, "lithium-polymer") )
+ else if ( !g_strcmp0 (tech, "lithium-polymer") )
{
return _("Lithium polymer");
}
- else if ( xfpm_strequal (tech, "nickel-metal-hydride") )
+ else if ( !g_strcmp0 (tech, "nickel-metal-hydride") )
{
return _("Nickel metal hydride");
}
@@ -478,11 +476,11 @@
static const gchar *
_translate_unit (const gchar *unit)
{
- if ( xfpm_strequal (unit, "mWh") )
+ if ( !g_strcmp0 (unit, "mWh") )
{
return _("mWh");
}
- else if ( xfpm_strequal (unit, "mAh") )
+ else if ( !g_strcmp0 (unit, "mAh") )
{
return _("mAh");
}
@@ -541,12 +539,12 @@
static void
hal_battery_battery_changed_cb (HalBattery *battery, const gchar *key)
{
- if ( xfpm_strequal (key, "battery.present") ||
- xfpm_strequal (key, "battery.rechargeable.is_charging") ||
- xfpm_strequal (key, "battery.rechargeable.is_discharging") ||
- xfpm_strequal (key, "battery.charge_level.current") ||
- xfpm_strequal (key, "battery.remaining_time") ||
- xfpm_strequal (key, "battery.charge_level.percentage") )
+ if ( !g_strcmp0 (key, "battery.present") ||
+ !g_strcmp0 (key, "battery.rechargeable.is_charging") ||
+ !g_strcmp0 (key, "battery.rechargeable.is_discharging") ||
+ !g_strcmp0 (key, "battery.charge_level.current") ||
+ !g_strcmp0 (key, "battery.remaining_time") ||
+ !g_strcmp0 (key, "battery.charge_level.percentage") )
{
hal_battery_refresh_all (battery);
g_signal_emit (G_OBJECT (battery), signals[BATTERY_CHANGED], 0);
Modified: xfce4-power-manager/trunk/libxfpm/hal-iface.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-iface.c 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/libxfpm/hal-iface.c 2009-03-28 23:43:22 UTC (rev 7020)
@@ -33,8 +33,6 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include "xfpm-string.h"
-
#include "hal-iface.h"
/* Init */
@@ -102,7 +100,7 @@
if ( dbus_error_is_set(&error) )
{
- if (!xfpm_strcmp(error.name,"org.freedesktop.DBus.Error.UnknownMethod"))
+ if ( !g_strcmp0 (error.name, "org.freedesktop.DBus.Error.UnknownMethod") )
{
dbus_error_free(&error);
return TRUE;
@@ -307,7 +305,7 @@
return FALSE;
}
- if ( xfpm_strequal("Suspend", shutdown ) )
+ if ( !g_strcmp0("Suspend", shutdown ) )
{
gint seconds = 0;
dbus_message_append_args (message, DBUS_TYPE_INT32, &seconds, DBUS_TYPE_INVALID);
Modified: xfce4-power-manager/trunk/libxfpm/hal-monitor.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/libxfpm/hal-monitor.c 2009-03-28 23:43:22 UTC (rev 7020)
@@ -96,7 +96,7 @@
const gchar *prev, const gchar *new,
HalMonitor *monitor)
{
- if ( !xfpm_strequal (name, "org.freedesktop.Hal") )
+ if ( g_strcmp0 (name, "org.freedesktop.Hal") != 0)
return;
if ( strlen (prev) != 0)
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-string.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-string.c 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-string.c 2009-03-28 23:43:22 UTC (rev 7020)
@@ -22,23 +22,13 @@
#include <config.h>
#endif
+#include <glib.h>
+
#include "xfpm-string.h"
-gint xfpm_strcmp (const gchar *str1, const gchar *str2)
-{
-#if GLIB_CHECK_VERSION(2, 16, 0)
- return g_strcmp0(str1, str2);
-#else
- if (!str1) return -(str1 != str2);
- if (!str2) return str1 != str2;
-
- return strcmp (str1, str2);
-#endif
-}
-
gboolean xfpm_strequal (const gchar *str1, const gchar *str2)
{
- if (xfpm_strcmp(str1, str2) == 0 ) return TRUE;
+ if ( g_strcmp0 (str1, str2) == 0 ) return TRUE;
return FALSE;
}
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/src/Makefile.am 2009-03-28 23:43:22 UTC (rev 7020)
@@ -70,8 +70,8 @@
xfce4_power_manager_LDADD = \
$(top_builddir)/libxfpm/libxfpmhal.la \
+ $(top_builddir)/libxfpm/libxfpmhalpower.la\
$(top_builddir)/libxfpm/libxfpmcommon.la\
- $(top_builddir)/libxfpm/libxfpmhal_iface.la\
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-03-28 21:10:28 UTC (rev 7019)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-03-28 23:43:22 UTC (rev 7020)
@@ -480,9 +480,8 @@
return conf->priv->dpms_enabled;
#endif /* HAVE_DPMS */
-#if GLIB_CHECK_VERSION (2, 16, 0)
g_warn_if_reached ();
-#endif
+
return FALSE;
}
@@ -501,9 +500,8 @@
else if ( xfpm_strequal (property, SHOW_TRAY_ICON_CFG ) )
return conf->priv->show_icon;
-#if GLIB_CHECK_VERSION (2, 16, 0)
g_warn_if_reached ();
-#endif
+
return 0;
}
@@ -528,8 +526,7 @@
return conf->priv->critical_level;
#endif /* HAVE_DPMS */
-#if GLIB_CHECK_VERSION (2, 16, 0)
g_warn_if_reached ();
-#endif
+
return 0;
}
More information about the Goodies-commits
mailing list