[gnome-control-center] Code cleanup as per HACKING.
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Code cleanup as per HACKING.
- Date: Fri, 25 Sep 2020 02:03:06 +0000 (UTC)
commit 9364deba3eb6920d7f297ee608bb70292cb8e5d6
Author: Brandon Nielsen <nielsenb jetfuse net>
Date: Thu Sep 24 19:09:13 2020 -0500
Code cleanup as per HACKING.
panels/printers/pp-ppd-selection-dialog.c | 132 ++++++++++++++----------------
1 file changed, 60 insertions(+), 72 deletions(-)
---
diff --git a/panels/printers/pp-ppd-selection-dialog.c b/panels/printers/pp-ppd-selection-dialog.c
index cf504392a..17cdc4023 100644
--- a/panels/printers/pp-ppd-selection-dialog.c
+++ b/panels/printers/pp-ppd-selection-dialog.c
@@ -35,8 +35,6 @@
#include "pp-ppd-selection-dialog.h"
-static void pp_ppd_selection_dialog_hide (PpPPDSelectionDialog *dialog);
-
enum
{
PPD_NAMES_COLUMN = 0,
@@ -68,54 +66,6 @@ struct _PpPPDSelectionDialog {
G_DEFINE_TYPE (PpPPDSelectionDialog, pp_ppd_selection_dialog, G_TYPE_OBJECT)
-static void populate_dialog (PpPPDSelectionDialog *self);
-
-static void pp_ppd_selection_dialog_finalize (GObject *object);
-
-static void
-pp_ppd_selection_dialog_class_init (PpPPDSelectionDialogClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = pp_ppd_selection_dialog_finalize;
-}
-
-
-PpPPDSelectionDialog *
-pp_ppd_selection_dialog_new (GtkWindow *parent,
- PPDList *ppd_list,
- const gchar *manufacturer,
- UserResponseCallback user_callback,
- gpointer user_data)
-{
- PpPPDSelectionDialog *self;
- GtkWidget *widget;
- g_autoptr(GError) error = NULL;
-
- self = g_object_new (PP_TYPE_PPD_SELECTION_DIALOG, NULL);
-
- self->user_callback = user_callback;
- self->user_data = user_data;
-
- self->list = ppd_list_copy (ppd_list);
-
- self->manufacturer = get_standard_manufacturers_name (manufacturer);
-
- gtk_window_set_transient_for (GTK_WINDOW (self->dialog), GTK_WINDOW (parent));
-
- widget = (GtkWidget*)
- gtk_builder_get_object (self->builder, "ppd-spinner");
- gtk_spinner_start (GTK_SPINNER (widget));
-
- populate_dialog (self);
-
- gtk_window_present (GTK_WINDOW (self->dialog));
- gtk_widget_show_all (GTK_WIDGET (self->dialog));
-
- return PP_PPD_SELECTION_DIALOG (self);
-}
-
static void
manufacturer_selection_changed_cb (PpPPDSelectionDialog *self)
{
@@ -339,7 +289,7 @@ ppd_selection_dialog_response_cb (PpPPDSelectionDialog *self,
GtkTreeView *models_treeview;
GtkTreeIter iter;
- pp_ppd_selection_dialog_hide (self);
+ gtk_widget_hide (GTK_WIDGET (self->dialog));
if (response_id == GTK_RESPONSE_OK)
{
@@ -366,6 +316,65 @@ ppd_selection_dialog_response_cb (PpPPDSelectionDialog *self,
self->user_callback (GTK_DIALOG (self->dialog), response_id, self->user_data);
}
+static void
+pp_ppd_selection_dialog_finalize (GObject *object)
+{
+ PpPPDSelectionDialog *self = PP_PPD_SELECTION_DIALOG (object);
+
+ g_clear_object (&self->builder);
+ g_clear_pointer (&self->dialog, gtk_widget_destroy);
+
+ g_clear_pointer (&self->ppd_name, g_free);
+ g_clear_pointer (&self->ppd_name, g_free);
+ g_clear_pointer (&self->ppd_display_name, g_free);
+
+ G_OBJECT_CLASS (pp_ppd_selection_dialog_parent_class)->finalize (object);
+}
+
+static void
+pp_ppd_selection_dialog_class_init (PpPPDSelectionDialogClass *klass)
+{
+ GObjectClass *object_class;
+
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = pp_ppd_selection_dialog_finalize;
+}
+
+
+PpPPDSelectionDialog *
+pp_ppd_selection_dialog_new (GtkWindow *parent,
+ PPDList *ppd_list,
+ const gchar *manufacturer,
+ UserResponseCallback user_callback,
+ gpointer user_data)
+{
+ PpPPDSelectionDialog *self;
+ GtkWidget *widget;
+ g_autoptr(GError) error = NULL;
+
+ self = g_object_new (PP_TYPE_PPD_SELECTION_DIALOG, NULL);
+
+ self->user_callback = user_callback;
+ self->user_data = user_data;
+
+ self->list = ppd_list_copy (ppd_list);
+
+ self->manufacturer = get_standard_manufacturers_name (manufacturer);
+
+ gtk_window_set_transient_for (GTK_WINDOW (self->dialog), GTK_WINDOW (parent));
+
+ widget = (GtkWidget*)
+ gtk_builder_get_object (self->builder, "ppd-spinner");
+ gtk_spinner_start (GTK_SPINNER (widget));
+
+ populate_dialog (self);
+
+ gtk_window_present (GTK_WINDOW (self->dialog));
+ gtk_widget_show_all (GTK_WIDGET (self->dialog));
+
+ return PP_PPD_SELECTION_DIALOG (self);
+}
+
static void
pp_ppd_selection_dialog_init (PpPPDSelectionDialog *self)
{
@@ -391,21 +400,6 @@ pp_ppd_selection_dialog_init (PpPPDSelectionDialog *self)
g_signal_connect_object (self->dialog, "response", G_CALLBACK (ppd_selection_dialog_response_cb), self,
G_CONNECT_SWAPPED);
}
-static void
-pp_ppd_selection_dialog_finalize (GObject *object)
-{
- PpPPDSelectionDialog *self = PP_PPD_SELECTION_DIALOG (object);
-
- g_clear_object (&self->builder);
- g_clear_pointer (&self->dialog, gtk_widget_destroy);
-
- g_clear_pointer (&self->ppd_name, g_free);
- g_clear_pointer (&self->ppd_name, g_free);
- g_clear_pointer (&self->ppd_display_name, g_free);
-
- G_OBJECT_CLASS (pp_ppd_selection_dialog_parent_class)->finalize (object);
-}
-
gchar *
pp_ppd_selection_dialog_get_ppd_name (PpPPDSelectionDialog *self)
{
@@ -425,9 +419,3 @@ pp_ppd_selection_dialog_set_ppd_list (PpPPDSelectionDialog *self,
self->list = list;
fill_ppds_list (self);
}
-
-static void
-pp_ppd_selection_dialog_hide (PpPPDSelectionDialog *self)
-{
- gtk_widget_hide (GTK_WIDGET (self->dialog));
-}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]