applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Printers: Fix more floating variant madness

Browse source 
Floating references were _such_ a good idea...
This commit is contained in:
Matthias Clasen 2012-02-13 23:19:27 -05:00
parent 639d85e345
commit 9dbc562777
1 changed files with 23 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

73
panels/printers/pp-new-printer-dialog.c
View file

@ -494,7 +494,6 @@ devices_get_cb (GObject *source_object,
{ {
GVariantBuilder device_list; GVariantBuilder device_list;
GVariantBuilder device_hash; GVariantBuilder device_hash;
GVariant *input = NULL;
GVariant *output = NULL; GVariant *output = NULL;
GVariant *array = NULL; GVariant *array = NULL;
GVariant *subarray = NULL; GVariant *subarray = NULL;
@ -532,11 +531,9 @@ devices_get_cb (GObject *source_object,
} }
} }
input = g_variant_new ("(v)", g_variant_builder_end (&device_list));
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"GroupPhysicalDevices", "GroupPhysicalDevices",
input, g_variant_new ("(v)", g_variant_builder_end (&device_list)),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
@ -568,7 +565,6 @@ devices_get_cb (GObject *source_object,
if (output) if (output)
g_variant_unref (output); g_variant_unref (output);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
} }
@ -616,7 +612,6 @@ devices_get (PpNewPrinterDialog *pp)
{ {
GDBusProxy *proxy; GDBusProxy *proxy;
GError *error = NULL; GError *error = NULL;
GVariant *dg_input = NULL;
GVariantBuilder *in_include = NULL; GVariantBuilder *in_include = NULL;
GVariantBuilder *in_exclude = NULL; GVariantBuilder *in_exclude = NULL;
GtkWidget *widget = NULL; GtkWidget *widget = NULL;
@ -654,12 +649,6 @@ devices_get (PpNewPrinterDialog *pp)
in_include = g_variant_builder_new (G_VARIANT_TYPE ("as")); in_include = g_variant_builder_new (G_VARIANT_TYPE ("as"));
in_exclude = g_variant_builder_new (G_VARIANT_TYPE ("as")); in_exclude = g_variant_builder_new (G_VARIANT_TYPE ("as"));
dg_input = g_variant_new ("(iiasas)",
0,
60,
in_include,
in_exclude);
widget = (GtkWidget*) widget = (GtkWidget*)
gtk_builder_get_object (pp->builder, "get-devices-status-label"); gtk_builder_get_object (pp->builder, "get-devices-status-label");
gtk_label_set_text (GTK_LABEL (widget), _("Getting devices...")); gtk_label_set_text (GTK_LABEL (widget), _("Getting devices..."));
@ -674,17 +663,17 @@ devices_get (PpNewPrinterDialog *pp)
g_dbus_proxy_call (proxy, g_dbus_proxy_call (proxy,
"DevicesGet", "DevicesGet",
dg_input, g_variant_new ("(iiasas)",
0,
60,
in_include,
in_exclude),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
pp->cancellable, pp->cancellable,
devices_get_cb, devices_get_cb,
pp); pp);
g_variant_builder_unref (in_exclude);
g_variant_builder_unref (in_include);
g_variant_unref (dg_input);
pp->searching = FALSE; pp->searching = FALSE;
} }
@ -777,7 +766,6 @@ service_enable (gchar *service_name,
gint service_timeout) gint service_timeout)
{ {
GDBusProxy *proxy; GDBusProxy *proxy;
GVariant *input = NULL;
GVariant *output = NULL; GVariant *output = NULL;
GError *error = NULL; GError *error = NULL;
@ -797,19 +785,17 @@ service_enable (gchar *service_name,
return; return;
} }
input = g_variant_new ("(si)",
service_name,
service_timeout);
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"enableService", "enableService",
input, g_variant_new ("(si)",
service_name,
service_timeout),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
if (output) if (output)
@ -827,7 +813,6 @@ static void
service_disable (gchar *service_name) service_disable (gchar *service_name)
{ {
GDBusProxy *proxy; GDBusProxy *proxy;
GVariant *input = NULL;
GVariant *output = NULL; GVariant *output = NULL;
GError *error = NULL; GError *error = NULL;
@ -847,17 +832,14 @@ service_disable (gchar *service_name)
return; return;
} }
input = g_variant_new ("(s)", service_name);
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"disableService", "disableService",
input, g_variant_new ("(s)", service_name),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
if (output) if (output)
@ -875,7 +857,6 @@ static gboolean
service_enabled (gchar *service_name) service_enabled (gchar *service_name)
{ {
GDBusProxy *proxy; GDBusProxy *proxy;
GVariant *input = NULL;
GVariant *output = NULL; GVariant *output = NULL;
GError *error = NULL; GError *error = NULL;
gint query_result = 0; gint query_result = 0;
@ -896,18 +877,14 @@ service_enabled (gchar *service_name)
return FALSE; return FALSE;
} }
input = g_variant_new ("(s)",
service_name);
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"queryService", "queryService",
input, g_variant_new ("(s)", service_name),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
if (output) if (output)
@ -1893,7 +1870,6 @@ new_printer_add_button_cb (GtkButton *button,
if (ppd_file_name) if (ppd_file_name)
{ {
GDBusProxy *proxy; GDBusProxy *proxy;
GVariant *input;
GVariant *output; GVariant *output;
GVariant *array; GVariant *array;
GList *executables = NULL; GList *executables = NULL;
@ -1912,18 +1888,13 @@ new_printer_add_button_cb (GtkButton *button,
if (proxy) if (proxy)
{ {
input = g_variant_new ("(s)",
ppd_file_name);
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"MissingExecutables", "MissingExecutables",
input, g_variant_new ("(s)", ppd_file_name),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
if (output) if (output)
@ -1978,18 +1949,16 @@ DBus method \"MissingExecutables\" to find missing executables and filters.");
for (exec_iter = executables; exec_iter; exec_iter = exec_iter->next) for (exec_iter = executables; exec_iter; exec_iter = exec_iter->next)
{ {
input = g_variant_new ("(ss)", (gchar *) exec_iter->data, "");
output = g_dbus_proxy_call_sync (proxy, output = g_dbus_proxy_call_sync (proxy,
"SearchFile", "SearchFile",
input, g_variant_new ("(ss)",
(gchar *) exec_iter->data,
""),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
if (output) if (output)
{ {
gboolean installed; gboolean installed;
@ -2047,24 +2016,20 @@ DBus method \"MissingExecutables\" to find missing executables and filters.");
"s", "s",
(gchar *) pkg_iter->data); (gchar *) pkg_iter->data);
input = g_variant_new ("(uass)", output = g_dbus_proxy_call_sync (proxy,
"InstallPackageNames",
g_variant_new ("(uass)",
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (pp->dialog))), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (pp->dialog))),
#else #else
0, 0,
#endif #endif
&array_builder, &array_builder,
"hide-finished"); "hide-finished"),
output = g_dbus_proxy_call_sync (proxy,
"InstallPackageNames",
input,
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
60000, 60000,
NULL, NULL,
&error); &error);
g_variant_unref (input);
g_object_unref (proxy); g_object_unref (proxy);
if (output) if (output)