[gnome-control-center] printers: Use g_autoptr
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] printers: Use g_autoptr
- Date: Tue, 22 Sep 2020 21:30:36 +0000 (UTC)
commit b2c5056031748f7d626217ce5b8af91ed871839c
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Jun 26 16:02:06 2020 +1200
printers: Use g_autoptr
panels/printers/cc-printers-panel.c | 4 +-
panels/printers/pp-cups.c | 15 ++-----
panels/printers/pp-ipp-option-widget.c | 3 +-
panels/printers/pp-job.c | 8 +---
panels/printers/pp-maintenance-command.c | 8 +---
panels/printers/pp-new-printer-dialog.c | 67 +++++++++++--------------------
panels/printers/pp-ppd-option-widget.c | 3 +-
panels/printers/pp-ppd-selection-dialog.c | 7 +---
panels/printers/pp-printer.c | 6 +--
panels/printers/pp-utils.c | 7 +---
10 files changed, 41 insertions(+), 87 deletions(-)
---
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index eb3f06bf4..f1fba04c1 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -259,7 +259,7 @@ printer_removed_cb (GObject *source_object,
if (user_data != NULL)
{
- GObject *reference = G_OBJECT (user_data);
+ g_autoptr(GObject) reference = G_OBJECT (user_data);
if (g_object_get_data (reference, "self") != NULL)
{
@@ -276,8 +276,6 @@ printer_removed_cb (GObject *source_object,
}
}
}
-
- g_object_unref (reference);
}
if (error != NULL)
diff --git a/panels/printers/pp-cups.c b/panels/printers/pp-cups.c
index 96ace837e..994257937 100644
--- a/panels/printers/pp-cups.c
+++ b/panels/printers/pp-cups.c
@@ -87,12 +87,11 @@ pp_cups_get_dests_async (PpCups *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_return_on_cancel (task, TRUE);
g_task_run_in_thread (task, (GTaskThreadFunc) _pp_cups_get_dests_thread);
- g_object_unref (task);
}
PpCupsDests *
@@ -133,13 +132,11 @@ pp_cups_connection_test_async (PpCups *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_return_on_cancel (task, TRUE);
g_task_run_in_thread (task, connection_test_thread);
-
- g_object_unref (task);
}
gboolean
@@ -186,13 +183,11 @@ pp_cups_cancel_subscription_async (PpCups *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, GINT_TO_POINTER (subscription_id), NULL);
g_task_run_in_thread (task, cancel_subscription_thread);
-
- g_object_unref (task);
}
gboolean
@@ -295,7 +290,7 @@ pp_cups_renew_subscription_async (PpCups *self,
gpointer user_data)
{
CRSData *subscription_data;
- GTask *task;
+ g_autoptr(GTask) task = NULL;
subscription_data = g_slice_new (CRSData);
subscription_data->id = subscription_id;
@@ -305,8 +300,6 @@ pp_cups_renew_subscription_async (PpCups *self,
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, subscription_data, (GDestroyNotify) crs_data_free);
g_task_run_in_thread (task, renew_subscription_thread);
-
- g_object_unref (task);
}
/* Returns id of renewed subscription or new id */
diff --git a/panels/printers/pp-ipp-option-widget.c b/panels/printers/pp-ipp-option-widget.c
index ae24d71e9..cbaf1cdc7 100644
--- a/panels/printers/pp-ipp-option-widget.c
+++ b/panels/printers/pp-ipp-option-widget.c
@@ -168,14 +168,13 @@ static GtkWidget *
combo_box_new (void)
{
GtkCellRenderer *cell;
- GtkListStore *store;
+ g_autoptr(GtkListStore) store = NULL;
GtkWidget *combo_box;
combo_box = gtk_combo_box_new ();
store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
- g_object_unref (store);
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
diff --git a/panels/printers/pp-job.c b/panels/printers/pp-job.c
index 81e4341ec..2753754d1 100644
--- a/panels/printers/pp-job.c
+++ b/panels/printers/pp-job.c
@@ -387,13 +387,11 @@ pp_job_get_attributes_async (PpJob *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, g_strdupv (attributes_names), (GDestroyNotify) g_strfreev);
g_task_run_in_thread (task, _pp_job_get_attributes_thread);
-
- g_object_unref (task);
}
GVariant *
@@ -450,13 +448,11 @@ pp_job_authenticate_async (PpJob *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, g_strdupv (auth_info), (GDestroyNotify) g_strfreev);
g_task_run_in_thread (task, _pp_job_authenticate_thread);
-
- g_object_unref (task);
}
gboolean
diff --git a/panels/printers/pp-maintenance-command.c b/panels/printers/pp-maintenance-command.c
index feb144ce7..fd843d003 100644
--- a/panels/printers/pp-maintenance-command.c
+++ b/panels/printers/pp-maintenance-command.c
@@ -272,13 +272,11 @@ pp_maintenance_command_execute_async (PpMaintenanceCommand *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_check_cancellable (task, TRUE);
g_task_run_in_thread (task, _pp_maintenance_command_execute_thread);
-
- g_object_unref (task);
}
gboolean
@@ -374,13 +372,11 @@ pp_maintenance_command_is_supported_async (PpMaintenanceCommand *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GTask *task;
+ g_autoptr(GTask) task = NULL;
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_check_cancellable (task, TRUE);
g_task_run_in_thread (task, _pp_maintenance_command_is_supported_thread);
-
- g_object_unref (task);
}
gboolean
diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
index 8ff3050f3..accb4642b 100644
--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -596,13 +596,14 @@ static void
remove_device_from_list (PpNewPrinterDialog *self,
const gchar *device_name)
{
- PpPrintDevice *device;
GtkTreeIter iter;
gboolean cont;
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
+
gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter,
DEVICE_COLUMN, &device,
-1);
@@ -610,12 +611,9 @@ remove_device_from_list (PpNewPrinterDialog *self,
if (g_strcmp0 (pp_print_device_get_device_name (device), device_name) == 0)
{
gtk_list_store_remove (self->store, &iter);
- g_object_unref (device);
break;
}
- g_object_unref (device);
-
cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), &iter);
}
@@ -628,7 +626,7 @@ prepend_original_name (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- PpPrintDevice *device;
+ g_autoptr(PpPrintDevice) device = NULL;
GList **list = data;
gtk_tree_model_get (model, iter,
@@ -637,8 +635,6 @@ prepend_original_name (GtkTreeModel *model,
*list = g_list_prepend (*list, g_strdup (pp_print_device_get_device_original_name (device)));
- g_object_unref (device);
-
return FALSE;
}
@@ -646,7 +642,6 @@ static void
add_device_to_list (PpNewPrinterDialog *self,
PpPrintDevice *device)
{
- PpPrintDevice *store_device;
GList *original_names_list = NULL;
gint acquisition_method;
@@ -702,6 +697,8 @@ add_device_to_list (PpNewPrinterDialog *self,
else if (pp_print_device_is_authenticated_server (device) &&
pp_print_device_get_host_name (device) != NULL)
{
+ g_autoptr(PpPrintDevice) store_device = NULL;
+
store_device = g_object_new (PP_TYPE_PRINT_DEVICE,
"device-name", pp_print_device_get_host_name (device),
"host-name", pp_print_device_get_host_name (device),
@@ -709,8 +706,6 @@ add_device_to_list (PpNewPrinterDialog *self,
NULL);
set_device (self, store_device, NULL);
-
- g_object_unref (store_device);
}
}
}
@@ -743,13 +738,14 @@ static PpPrintDevice *
device_in_liststore (gchar *device_uri,
GtkListStore *device_liststore)
{
- PpPrintDevice *device;
GtkTreeIter iter;
gboolean cont;
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (device_liststore), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
+
gtk_tree_model_get (GTK_TREE_MODEL (device_liststore), &iter,
DEVICE_COLUMN, &device,
-1);
@@ -758,11 +754,9 @@ device_in_liststore (gchar *device_uri,
if (pp_print_device_get_device_uri (device) != NULL &&
g_str_has_prefix (pp_print_device_get_device_uri (device), device_uri))
{
- return device;
+ return g_steal_pointer(&device);
}
- g_object_unref (device);
-
cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (device_liststore), &iter);
}
@@ -809,7 +803,6 @@ group_physical_devices_cb (gchar ***device_uris,
gpointer user_data)
{
PpNewPrinterDialog *self = user_data;
- PpPrintDevice *device, *better_device;
gint i, j;
if (device_uris != NULL)
@@ -819,7 +812,8 @@ group_physical_devices_cb (gchar ***device_uris,
/* Is there any device in this sublist? */
if (device_uris[i][0] != NULL)
{
- device = NULL;
+ g_autoptr(PpPrintDevice) device = NULL;
+
for (j = 0; device_uris[i][j] != NULL; j++)
{
device = device_in_liststore (device_uris[i][j], self->store);
@@ -833,21 +827,17 @@ group_physical_devices_cb (gchar ***device_uris,
/* Is there better device in the sublist? */
if (j != 0)
{
+ g_autoptr(PpPrintDevice) better_device = NULL;
+
better_device = device_in_list (device_uris[i][0], self->local_cups_devices);
replace_device (self, device, better_device);
- g_object_unref (better_device);
}
-
- g_object_unref (device);
}
else
{
device = device_in_list (device_uris[i][0], self->local_cups_devices);
if (device != NULL)
- {
- set_device (self, device, NULL);
- g_object_unref (device);
- }
+ set_device (self, device, NULL);
}
}
}
@@ -932,7 +922,6 @@ get_cups_devices_cb (GPtrArray *devices,
GVariantBuilder device_list;
GVariantBuilder device_hash;
PpPrintDevice **all_devices;
- PpPrintDevice *device;
const gchar *device_class;
GtkTreeIter iter;
gboolean cont;
@@ -960,6 +949,8 @@ get_cups_devices_cb (GPtrArray *devices,
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
+
gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter,
DEVICE_COLUMN, &device,
-1);
@@ -972,8 +963,6 @@ get_cups_devices_cb (GPtrArray *devices,
NULL);
i++;
- g_object_unref (device);
-
cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), &iter);
}
@@ -1427,7 +1416,6 @@ search_address (const gchar *text,
PpNewPrinterDialog *self,
gboolean delay_search)
{
- PpPrintDevice *device;
GtkTreeIter iter;
gboolean found = FALSE;
gboolean subfound;
@@ -1449,6 +1437,7 @@ search_address (const gchar *text,
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
g_autofree gchar *lowercase_name = NULL;
g_autofree gchar *lowercase_location = NULL;
@@ -1477,8 +1466,6 @@ search_address (const gchar *text,
DEVICE_VISIBLE_COLUMN, subfound,
-1);
- g_object_unref (device);
-
cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), &iter);
}
@@ -1494,6 +1481,8 @@ search_address (const gchar *text,
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
+
next_set = FALSE;
gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter,
DEVICE_COLUMN, &device,
@@ -1504,7 +1493,6 @@ search_address (const gchar *text,
-1);
acquisition_method = pp_print_device_get_acquisition_method (device);
- g_object_unref (device);
if (acquisition_method == ACQUISITION_METHOD_REMOTE_CUPS_SERVER ||
acquisition_method == ACQUISITION_METHOD_SNMP ||
acquisition_method == ACQUISITION_METHOD_JETDIRECT ||
@@ -1708,7 +1696,6 @@ replace_device (PpNewPrinterDialog *self,
PpPrintDevice *old_device,
PpPrintDevice *new_device)
{
- PpPrintDevice *device;
GtkTreeIter iter;
gboolean cont;
@@ -1717,6 +1704,8 @@ replace_device (PpNewPrinterDialog *self,
cont = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter);
while (cont)
{
+ g_autoptr(PpPrintDevice) device = NULL;
+
gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter,
DEVICE_COLUMN, &device,
-1);
@@ -1724,12 +1713,9 @@ replace_device (PpNewPrinterDialog *self,
if (old_device == device)
{
set_device (self, new_device, &iter);
- g_object_unref (device);
break;
}
- g_object_unref (device);
-
cont = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), &iter);
}
}
@@ -1844,9 +1830,10 @@ populate_devices_list (PpNewPrinterDialog *self)
{
GtkTreeViewColumn *column;
PpSamba *samba;
- GEmblem *emblem;
+ g_autoptr(GEmblem) emblem = NULL;
PpCups *cups;
- GIcon *icon, *emblem_icon;
+ g_autoptr(GIcon) icon = NULL;
+ g_autoptr(GIcon) emblem_icon = NULL;
GtkCellRenderer *text_renderer;
GtkCellRenderer *icon_renderer;
@@ -1865,10 +1852,6 @@ populate_devices_list (PpNewPrinterDialog *self)
self->authenticated_server_icon = g_emblemed_icon_new (icon, emblem);
- g_object_unref (icon);
- g_object_unref (emblem_icon);
- g_object_unref (emblem);
-
icon_renderer = gtk_cell_renderer_pixbuf_new ();
g_object_set (icon_renderer, "stock-size", GTK_ICON_SIZE_DIALOG, NULL);
gtk_cell_renderer_set_alignment (icon_renderer, 1.0, 0.5);
@@ -2023,7 +2006,7 @@ static void
new_printer_dialog_response_cb (PpNewPrinterDialog *self,
gint response_id)
{
- PpPrintDevice *device = NULL;
+ g_autoptr(PpPrintDevice) device = NULL;
GtkTreeModel *model;
GtkTreeIter iter;
gint acquisition_method;
@@ -2095,8 +2078,6 @@ new_printer_dialog_response_cb (PpNewPrinterDialog *self,
printer_add_async_cb,
self);
}
-
- g_object_unref (device);
}
}
else
diff --git a/panels/printers/pp-ppd-option-widget.c b/panels/printers/pp-ppd-option-widget.c
index 74f425bcc..78dda5d6e 100644
--- a/panels/printers/pp-ppd-option-widget.c
+++ b/panels/printers/pp-ppd-option-widget.c
@@ -226,14 +226,13 @@ static GtkWidget *
combo_box_new (void)
{
GtkCellRenderer *cell;
- GtkListStore *store;
+ g_autoptr(GtkListStore) store = NULL;
GtkWidget *combo_box;
combo_box = gtk_combo_box_new ();
store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
- g_object_unref (store);
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
diff --git a/panels/printers/pp-ppd-selection-dialog.c b/panels/printers/pp-ppd-selection-dialog.c
index 87782908c..025b47300 100644
--- a/panels/printers/pp-ppd-selection-dialog.c
+++ b/panels/printers/pp-ppd-selection-dialog.c
@@ -68,7 +68,7 @@ static void
manufacturer_selection_changed_cb (PpPPDSelectionDialog *self)
{
GtkTreeView *treeview;
- GtkListStore *store;
+ g_autoptr(GtkListStore) store = NULL;
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreeView *models_treeview;
@@ -113,7 +113,6 @@ manufacturer_selection_changed_cb (PpPPDSelectionDialog *self)
}
gtk_tree_view_set_model (models_treeview, GTK_TREE_MODEL (store));
- g_object_unref (store);
gtk_tree_view_columns_autosize (models_treeview);
}
@@ -156,7 +155,7 @@ static void
fill_ppds_list (PpPPDSelectionDialog *self)
{
GtkTreeSelection *selection;
- GtkListStore *store;
+ g_autoptr(GtkListStore) store = NULL;
GtkTreePath *path;
GtkTreeView *treeview;
GtkTreeIter iter;
@@ -206,8 +205,6 @@ fill_ppds_list (PpPPDSelectionDialog *self)
gtk_tree_path_free (path);
gtk_tree_iter_free (preselect_iter);
}
-
- g_object_unref (store);
}
}
diff --git a/panels/printers/pp-printer.c b/panels/printers/pp-printer.c
index 451f9b91e..e348fba0c 100644
--- a/panels/printers/pp-printer.c
+++ b/panels/printers/pp-printer.c
@@ -387,7 +387,7 @@ pp_printer_get_jobs_async (PpPrinter *self,
gpointer user_data)
{
GetJobsData *get_jobs_data;
- GTask *task;
+ g_autoptr(GTask) task = NULL;
get_jobs_data = g_new (GetJobsData, 1);
get_jobs_data->myjobs = myjobs;
@@ -397,7 +397,6 @@ pp_printer_get_jobs_async (PpPrinter *self,
g_task_set_task_data (task, get_jobs_data, g_free);
g_task_set_return_on_cancel (task, TRUE);
g_task_run_in_thread (task, get_jobs_thread);
- g_object_unref (task);
}
GPtrArray *
@@ -605,7 +604,7 @@ pp_printer_print_file_async (PpPrinter *self,
gpointer user_data)
{
PrintFileData *print_file_data;
- GTask *task;
+ g_autoptr(GTask) task = NULL;
print_file_data = g_new (PrintFileData, 1);
print_file_data->filename = g_strdup (filename);
@@ -617,7 +616,6 @@ pp_printer_print_file_async (PpPrinter *self,
g_task_set_task_data (task, print_file_data, (GDestroyNotify) print_file_data_free);
g_task_run_in_thread (task, print_file_thread);
- g_object_unref (task);
}
gboolean
diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
index ce3e4344e..6f79b9258 100644
--- a/panels/printers/pp-utils.c
+++ b/panels/printers/pp-utils.c
@@ -1595,10 +1595,10 @@ printer_set_ppd_file_async (const gchar *printer_name,
PSPCallback callback,
gpointer user_data)
{
- GFileIOStream *stream;
+ g_autoptr(GFileIOStream) stream = NULL;
PSPData *data;
GFile *source_ppd_file;
- GFile *destination_ppd_file;
+ g_autoptr(GFile) destination_ppd_file = NULL;
data = g_new0 (PSPData, 1);
if (cancellable)
@@ -1619,7 +1619,6 @@ printer_set_ppd_file_async (const gchar *printer_name,
*/
source_ppd_file = g_file_new_for_path (ppd_filename);
destination_ppd_file = g_file_new_tmp ("g-c-c-XXXXXX.ppd", &stream, NULL);
- g_object_unref (stream);
data->ppd_copy = g_strdup (g_file_get_path (destination_ppd_file));
g_file_copy_async (source_ppd_file,
@@ -1632,8 +1631,6 @@ printer_set_ppd_file_async (const gchar *printer_name,
printer_set_ppd_file_async_scb,
data);
- g_object_unref (destination_ppd_file);
-
return;
out:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
