[gnome-color-manager] Remove the GetProfilesForDevice() DBus method call
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Remove the GetProfilesForDevice() DBus method call
- Date: Tue, 12 Jul 2011 09:08:32 +0000 (UTC)
commit 85709882a2d04192ba8ca4f45653bf271b881755
Author: Richard Hughes <richard hughsie com>
Date: Tue Jul 12 09:26:28 2011 +0100
Remove the GetProfilesForDevice() DBus method call
The last user (simple-scan) has been ported to colord.
src/gcm-session.c | 66 ----------------------------------------
src/org.gnome.ColorManager.xml | 41 -------------------------
2 files changed, 0 insertions(+), 107 deletions(-)
---
diff --git a/src/gcm-session.c b/src/gcm-session.c
index 26bce60..c6de38f 100644
--- a/src/gcm-session.c
+++ b/src/gcm-session.c
@@ -121,43 +121,6 @@ out:
}
/**
- * gcm_session_get_profiles_for_device:
- **/
-static GPtrArray *
-gcm_session_get_profiles_for_device (GcmSessionPrivate *priv,
- const gchar *device_id_with_prefix,
- GError **error)
-{
- CdDevice *device;
- gchar *device_id;
- GPtrArray *profiles = NULL;
-
- /* reformat to the device-and-profile-naming-spec */
- device_id = g_strdup (device_id_with_prefix);
- if (g_str_has_prefix (device_id_with_prefix, "sane:"))
- device_id[4] = '-';
-
- /* get list */
- g_debug ("query=%s", device_id);
- device = cd_client_find_device_sync (priv->client,
- device_id,
- NULL,
- error);
- if (device == NULL)
- goto out;
- profiles = cd_device_get_profiles (device);
- if (profiles->len == 0) {
- g_set_error_literal (error, 1, 0, "No profiles were found.");
- goto out;
- }
-out:
- g_free (device_id);
- if (device != NULL)
- g_object_unref (device);
- return profiles;
-}
-
-/**
* gcm_session_handle_method_call:
**/
static void
@@ -168,39 +131,13 @@ gcm_session_handle_method_call (GDBusConnection *connection_, const gchar *sende
{
GVariant *tuple = NULL;
GVariant *value = NULL;
- gchar *device_id = NULL;
gchar *filename = NULL;
gchar *hints = NULL;
- gchar *type = NULL;
GPtrArray *array = NULL;
- gchar **devices = NULL;
GError *error = NULL;
GcmSessionPrivate *priv = (GcmSessionPrivate *) user_data;
/* return 'a(ss)' */
- if (g_strcmp0 (method_name, "GetProfilesForDevice") == 0) {
- g_variant_get (parameters, "(ss)", &device_id, &hints);
-
- /* get array of profile filenames */
- array = gcm_session_get_profiles_for_device (priv,
- device_id,
- &error);
- if (array == NULL) {
- g_dbus_method_invocation_return_dbus_error (invocation,
- "org.gnome.ColorManager.Failed",
- error->message);
- g_error_free (error);
- goto out;
- }
-
- /* format the value */
- value = gcm_session_variant_from_profile_array (array);
- tuple = g_variant_new_tuple (&value, 1);
- g_dbus_method_invocation_return_value (invocation, tuple);
- goto out;
- }
-
- /* return 'a(ss)' */
if (g_strcmp0 (method_name, "GetProfilesForFile") == 0) {
g_variant_get (parameters, "(ss)", &filename, &hints);
@@ -229,11 +166,8 @@ out:
g_variant_unref (tuple);
if (value != NULL)
g_variant_unref (value);
- g_free (device_id);
- g_free (type);
g_free (filename);
g_free (hints);
- g_strfreev (devices);
return;
}
diff --git a/src/org.gnome.ColorManager.xml b/src/org.gnome.ColorManager.xml
index eac9b7e..3651f6e 100644
--- a/src/org.gnome.ColorManager.xml
+++ b/src/org.gnome.ColorManager.xml
@@ -10,47 +10,6 @@
</doc:para>
</doc:description>
</doc:doc>
-
- <!--*****************************************************************************************-->
- <method name='GetProfilesForDevice'>
- <annotation name='org.freedesktop.DBus.GLib.Async' value=''/>
- <doc:doc>
- <doc:description>
- <doc:para>
- Gets the profiles for a specific device.
- </doc:para>
- </doc:description>
- </doc:doc>
- <arg type='s' name='device_id' direction='in'>
- <doc:doc>
- <doc:summary>
- <doc:para>
- A device ID which can be a sysfs path, e.g. <doc:tt>sysfs:/sys/class/usb/hiddev0</doc:tt>
- or a raw device ID, e.g. <doc:tt>xrandr_ibm_france_ltn154p2_l05</doc:tt>.
- </doc:para>
- </doc:summary>
- </doc:doc>
- </arg>
- <arg type='s' name='options' direction='in'>
- <doc:doc>
- <doc:summary>
- <doc:para>
- Options to give hints about what profiles to choose. Currently unused.
- </doc:para>
- </doc:summary>
- </doc:doc>
- </arg>
- <arg type='a(ss)' name='profiles' direction='out'>
- <doc:doc>
- <doc:summary>
- <doc:para>
- An array of profile display names and filenames of suitable profiles to use with this device.
- </doc:para>
- </doc:summary>
- </doc:doc>
- </arg>
- </method>
-
<!--*****************************************************************************************-->
<method name='GetProfilesForFile'>
<annotation name='org.freedesktop.DBus.GLib.Async' value=''/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]