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

printers: Use async rename method

Browse source 
pp_printer_rename_async is better than the old printer_rename
utility.

The PpDetailsDialog doesn't need to do anything in the callback
since we are emiting the "printer-changed" signal when the dialog
is closed.

https://bugzilla.gnome.org/show_bug.cgi?id=769114
This commit is contained in:
Felipe Borges 2017-02-15 15:15:50 +01:00
parent 5fa1dede21
commit ca30e0ead9
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
panels/printers/pp-details-dialog.c
View file

@ -36,6 +36,7 @@
#include "cc-editable-entry.h" #include "cc-editable-entry.h"
#include "pp-details-dialog.h" #include "pp-details-dialog.h"
#include "pp-ppd-selection-dialog.h" #include "pp-ppd-selection-dialog.h"
#include "pp-printer.h"
#include "pp-utils.h" #include "pp-utils.h"
struct _PpDetailsDialog { struct _PpDetailsDialog {
@ -67,6 +68,16 @@ struct _PpDetailsDialogClass
G_DEFINE_TYPE (PpDetailsDialog, pp_details_dialog, GTK_TYPE_DIALOG) G_DEFINE_TYPE (PpDetailsDialog, pp_details_dialog, GTK_TYPE_DIALOG)
static void
on_printer_rename_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
pp_printer_rename_finish (PP_PRINTER (source_object), result, NULL);
g_object_unref (source_object);
}
static void static void
pp_details_dialog_response_cb (GtkDialog *dialog, pp_details_dialog_response_cb (GtkDialog *dialog,
gint response_id, gint response_id,
@ -87,9 +98,13 @@ pp_details_dialog_response_cb (GtkDialog *dialog,
new_name = gtk_entry_get_text (GTK_ENTRY (self->printer_name_entry)); new_name = gtk_entry_get_text (GTK_ENTRY (self->printer_name_entry));
if (g_strcmp0 (self->printer_name, new_name) != 0) if (g_strcmp0 (self->printer_name, new_name) != 0)
{ {
printer_rename (self->printer_name, new_name); PpPrinter *printer = pp_printer_new (self->printer_name);
self->printer_name = g_strdup (new_name); pp_printer_rename_async (printer,
new_name,
NULL,
on_printer_rename_cb,
NULL);
} }
} }

2
panels/printers/pp-printer.c
View file

@ -267,6 +267,8 @@ pp_printer_rename_async (PpPrinter *printer,
{ {
GTask *task; GTask *task;
g_return_if_fail (new_printer_name != NULL);
task = g_task_new (G_OBJECT (printer), cancellable, callback, user_data); task = g_task_new (G_OBJECT (printer), cancellable, callback, user_data);
g_task_set_task_data (task, g_strdup (new_printer_name), g_free); g_task_set_task_data (task, g_strdup (new_printer_name), g_free);