[gnome-settings-daemon] print-notifications: Correct signature when calling PrinterAddOptionDefault
- From: Marek KaÅÃk <mkasik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] print-notifications: Correct signature when calling PrinterAddOptionDefault
- Date: Fri, 14 Oct 2011 12:25:05 +0000 (UTC)
commit 3178e69f9386de42064897110e448d5819e3e169
Author: Marek Kasik <mkasik redhat com>
Date: Fri Oct 14 14:24:37 2011 +0200
print-notifications: Correct signature when calling PrinterAddOptionDefault
Correct signature of PrinterAddOptionDefault is ssas (rhbz #743870).
plugins/print-notifications/gsd-printer.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/plugins/print-notifications/gsd-printer.c b/plugins/print-notifications/gsd-printer.c
index 6f5df5f..f61ad4d 100644
--- a/plugins/print-notifications/gsd-printer.c
+++ b/plugins/print-notifications/gsd-printer.c
@@ -758,7 +758,7 @@ set_default_paper_size (const gchar *printer_name,
GVariant *input;
GVariant *output;
GError *error = NULL;
- gchar **value = NULL;
+ gchar *value = NULL;
gint i, j, k;
const gchar *paper_size;
@@ -798,8 +798,7 @@ set_default_paper_size (const gchar *printer_name,
ppd_file->groups[i].options[j].choices[k].choice,
strlen (paper_size)) == 0 &&
!ppd_file->groups[i].options[j].choices[k].marked) {
- value = g_new0 (gchar *, 2);
- value[0] = g_strdup (ppd_file->groups[i].options[j].choices[k].choice);
+ value = g_strdup (ppd_file->groups[i].options[j].choices[k].choice);
break;
}
}
@@ -810,14 +809,15 @@ set_default_paper_size (const gchar *printer_name,
}
if (value) {
- GVariant *array;
+ GVariantBuilder *builder;
- array = g_variant_new_strv ((const gchar * const *)value, -1);
+ builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+ g_variant_builder_add (builder, "s", value);
- input = g_variant_new ("(ssv)",
+ input = g_variant_new ("(ssas)",
printer_name ? printer_name : "",
- "PageSize-default",
- array);
+ "PageSize",
+ builder);
output = g_dbus_proxy_call_sync (proxy,
"PrinterAddOptionDefault",
@@ -834,9 +834,9 @@ set_default_paper_size (const gchar *printer_name,
g_error_free (error);
}
+ g_variant_builder_unref (builder);
g_variant_unref (input);
- g_variant_unref (array);
- g_strfreev (value);
+ g_free (value);
}
g_object_unref (proxy);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]