fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-05 19:18:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Protect the non-GObject accessors with DKP_DISABLE_DEPRECIATED and fix up the client tool

Browse source
This commit is contained in:
Richard Hughes 2009-07-03 10:52:24 +01:00
parent e827a73922
commit 0a5149ea6a
5 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devkit-power-gobject/dkp-client.c
View file

@ -311,6 +311,7 @@ out:
g_hash_table_unref (props);
}
#ifndef DKP_DISABLE_DEPRECIATED
/**
* dkp_client_get_daemon_version:
* @client : a #DkpClient instance.
@ -406,6 +407,7 @@ dkp_client_on_low_battery (DkpClient *client)
dkp_client_ensure_properties (client);
return client->priv->on_low_battery;
}
#endif
/**
* dkp_client_add:

2
devkit-power-gobject/dkp-client.h
View file

@ -79,12 +79,14 @@ gboolean dkp_client_suspend (DkpClient *client,
GError **error);
gboolean dkp_client_hibernate (DkpClient *client,
GError **error);
#ifndef DKP_DISABLE_DEPRECIATED
const gchar *dkp_client_get_daemon_version (DkpClient *client);
gboolean dkp_client_can_hibernate (DkpClient *client);
gboolean dkp_client_lid_is_closed (DkpClient *client);
gboolean dkp_client_can_suspend (DkpClient *client);
gboolean dkp_client_on_battery (DkpClient *client);
gboolean dkp_client_on_low_battery (DkpClient *client);
#endif
G_END_DECLS

1
src/Makefile.am
View file

@ -11,6 +11,7 @@ INCLUDES = \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-DDKP_COMPILATION \
-DDKP_DISABLE_DEPRECIATED \
-DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \

1
tools/Makefile.am
View file

@ -10,6 +10,7 @@ INCLUDES = \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-DDKP_COMPILATION \
-DDKP_DISABLE_DEPRECIATED \
-DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \

44
tools/dkp-tool.c
View file

@ -78,15 +78,39 @@ dkp_tool_device_removed_cb (DkpClient *client, const DkpDevice *device, gpointer
g_print ("\n");
}
/**
* dkp_client_print:
**/
static void
dkp_client_print (DkpClient *client)
{
g_print (" daemon-version: %s\n", dkp_client_get_daemon_version (client));
g_print (" can-suspend: %s\n", dkp_client_can_suspend (client) ? "yes" : "no");
g_print (" can-hibernate %s\n", dkp_client_can_hibernate (client) ? "yes" : "no");
g_print (" on-battery: %s\n", dkp_client_on_battery (client) ? "yes" : "no");
g_print (" on-low-battery: %s\n", dkp_client_on_low_battery (client) ? "yes" : "no");
g_print (" lid-is-closed: %s\n", dkp_client_lid_is_closed (client) ? "yes" : "no");
gchar *daemon_version;
gboolean can_suspend;
gboolean can_hibernate;
gboolean on_battery;
gboolean on_low_battery;
gboolean lid_is_closed;
gboolean lid_is_present;
g_object_get (client,
"daemon-version", &daemon_version,
"can-suspend", &can_suspend,
"can-hibernate", &can_hibernate,
"on-battery", &on_battery,
"on-low_battery", &on_low_battery,
"lid-is-closed", &lid_is_closed,
"lid-is-present", &lid_is_present,
NULL);
g_print (" daemon-version: %s\n", daemon_version);
g_print (" can-suspend: %s\n", can_suspend ? "yes" : "no");
g_print (" can-hibernate %s\n", can_hibernate ? "yes" : "no");
g_print (" on-battery: %s\n", on_battery ? "yes" : "no");
g_print (" on-low-battery: %s\n", on_low_battery ? "yes" : "no");
g_print (" lid-is-closed: %s\n", lid_is_closed ? "yes" : "no");
g_print (" lid-is-present: %s\n", lid_is_present ? "yes" : "no");
g_free (daemon_version);
}
/**
@ -209,10 +233,14 @@ main (int argc, char **argv)
client = dkp_client_new ();
if (opt_version) {
gchar *daemon_version;
g_object_get (client,
"daemon-version", &daemon_version,
NULL);
g_print ("DeviceKit-power client version %s\n"
"DeviceKit-power daemon version %s\n",
PACKAGE_VERSION,
dkp_client_get_daemon_version (client));
PACKAGE_VERSION, daemon_version);
g_free (daemon_version);
retval = 0;
goto out;
}