printers: Use self variable to match coding style
This commit is contained in:
Robert Ancell
parent
a3c251301e
commit
47cd15d911
14 changed files with 1187 additions and 1238 deletions
|
|
@ -70,7 +70,7 @@ static void
|
|||
manufacturer_selection_changed_cb (GtkTreeSelection *selection,
|
||||
gpointer user_data)
|
||||
{
|
||||
PpPPDSelectionDialog *dialog = (PpPPDSelectionDialog *) user_data;
|
||||
PpPPDSelectionDialog *self = user_data;
|
||||
GtkListStore *store;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
|
|
@ -88,10 +88,10 @@ manufacturer_selection_changed_cb (GtkTreeSelection *selection,
|
|||
if (manufacturer_name)
|
||||
{
|
||||
index = -1;
|
||||
for (i = 0; i < dialog->list->num_of_manufacturers; i++)
|
||||
for (i = 0; i < self->list->num_of_manufacturers; i++)
|
||||
{
|
||||
if (g_strcmp0 (manufacturer_name,
|
||||
dialog->list->manufacturers[i]->manufacturer_name) == 0)
|
||||
self->list->manufacturers[i]->manufacturer_name) == 0)
|
||||
{
|
||||
index = i;
|
||||
break;
|
||||
|
|
@ -101,16 +101,16 @@ manufacturer_selection_changed_cb (GtkTreeSelection *selection,
|
|||
if (index >= 0)
|
||||
{
|
||||
models_treeview = (GtkTreeView*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-selection-models-treeview");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-models-treeview");
|
||||
|
||||
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
|
||||
|
||||
for (i = 0; i < dialog->list->manufacturers[index]->num_of_ppds; i++)
|
||||
for (i = 0; i < self->list->manufacturers[index]->num_of_ppds; i++)
|
||||
{
|
||||
gtk_list_store_append (store, &iter);
|
||||
gtk_list_store_set (store, &iter,
|
||||
PPD_NAMES_COLUMN, dialog->list->manufacturers[index]->ppds[i]->ppd_name,
|
||||
PPD_DISPLAY_NAMES_COLUMN, dialog->list->manufacturers[index]->ppds[i]->ppd_display_name,
|
||||
PPD_NAMES_COLUMN, self->list->manufacturers[index]->ppds[i]->ppd_name,
|
||||
PPD_DISPLAY_NAMES_COLUMN, self->list->manufacturers[index]->ppds[i]->ppd_display_name,
|
||||
-1);
|
||||
}
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ static void
|
|||
model_selection_changed_cb (GtkTreeSelection *selection,
|
||||
gpointer user_data)
|
||||
{
|
||||
PpPPDSelectionDialog *dialog = (PpPPDSelectionDialog *) user_data;
|
||||
PpPPDSelectionDialog *self = user_data;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
GtkWidget *widget;
|
||||
|
|
@ -141,7 +141,7 @@ model_selection_changed_cb (GtkTreeSelection *selection,
|
|||
}
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-selection-select-button");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-select-button");
|
||||
|
||||
if (model_name)
|
||||
{
|
||||
|
|
@ -155,7 +155,7 @@ model_selection_changed_cb (GtkTreeSelection *selection,
|
|||
}
|
||||
|
||||
static void
|
||||
fill_ppds_list (PpPPDSelectionDialog *dialog)
|
||||
fill_ppds_list (PpPPDSelectionDialog *self)
|
||||
{
|
||||
GtkTreeSelection *selection;
|
||||
GtkListStore *store;
|
||||
|
|
@ -167,31 +167,31 @@ fill_ppds_list (PpPPDSelectionDialog *dialog)
|
|||
gint i;
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-spinner");
|
||||
gtk_builder_get_object (self->builder, "ppd-spinner");
|
||||
gtk_widget_hide (widget);
|
||||
gtk_spinner_stop (GTK_SPINNER (widget));
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "progress-label");
|
||||
gtk_builder_get_object (self->builder, "progress-label");
|
||||
gtk_widget_hide (widget);
|
||||
|
||||
treeview = (GtkTreeView*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-selection-manufacturers-treeview");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-manufacturers-treeview");
|
||||
|
||||
if (dialog->list)
|
||||
if (self->list)
|
||||
{
|
||||
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
|
||||
|
||||
for (i = 0; i < dialog->list->num_of_manufacturers; i++)
|
||||
for (i = 0; i < self->list->num_of_manufacturers; i++)
|
||||
{
|
||||
gtk_list_store_append (store, &iter);
|
||||
gtk_list_store_set (store, &iter,
|
||||
PPD_MANUFACTURERS_NAMES_COLUMN, dialog->list->manufacturers[i]->manufacturer_name,
|
||||
PPD_MANUFACTURERS_DISPLAY_NAMES_COLUMN, dialog->list->manufacturers[i]->manufacturer_display_name,
|
||||
PPD_MANUFACTURERS_NAMES_COLUMN, self->list->manufacturers[i]->manufacturer_name,
|
||||
PPD_MANUFACTURERS_DISPLAY_NAMES_COLUMN, self->list->manufacturers[i]->manufacturer_display_name,
|
||||
-1);
|
||||
|
||||
if (g_strcmp0 (dialog->manufacturer,
|
||||
dialog->list->manufacturers[i]->manufacturer_display_name) == 0)
|
||||
if (g_strcmp0 (self->manufacturer,
|
||||
self->list->manufacturers[i]->manufacturer_display_name) == 0)
|
||||
{
|
||||
preselect_iter = gtk_tree_iter_copy (&iter);
|
||||
}
|
||||
|
|
@ -214,7 +214,7 @@ fill_ppds_list (PpPPDSelectionDialog *dialog)
|
|||
}
|
||||
|
||||
static void
|
||||
populate_dialog (PpPPDSelectionDialog *dialog)
|
||||
populate_dialog (PpPPDSelectionDialog *self)
|
||||
{
|
||||
GtkTreeViewColumn *column;
|
||||
GtkCellRenderer *renderer;
|
||||
|
|
@ -224,7 +224,7 @@ populate_dialog (PpPPDSelectionDialog *dialog)
|
|||
GtkWidget *header;
|
||||
|
||||
manufacturers_treeview = (GtkTreeView*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-selection-manufacturers-treeview");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-manufacturers-treeview");
|
||||
|
||||
renderer = gtk_cell_renderer_text_new ();
|
||||
gtk_cell_renderer_set_padding (renderer, 10, 0);
|
||||
|
|
@ -241,7 +241,7 @@ populate_dialog (PpPPDSelectionDialog *dialog)
|
|||
|
||||
|
||||
models_treeview = (GtkTreeView*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-selection-models-treeview");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-models-treeview");
|
||||
|
||||
renderer = gtk_cell_renderer_text_new ();
|
||||
gtk_cell_renderer_set_padding (renderer, 10, 0);
|
||||
|
|
@ -259,27 +259,27 @@ populate_dialog (PpPPDSelectionDialog *dialog)
|
|||
|
||||
|
||||
g_signal_connect (gtk_tree_view_get_selection (models_treeview),
|
||||
"changed", G_CALLBACK (model_selection_changed_cb), dialog);
|
||||
"changed", G_CALLBACK (model_selection_changed_cb), self);
|
||||
|
||||
g_signal_connect (gtk_tree_view_get_selection (manufacturers_treeview),
|
||||
"changed", G_CALLBACK (manufacturer_selection_changed_cb), dialog);
|
||||
"changed", G_CALLBACK (manufacturer_selection_changed_cb), self);
|
||||
|
||||
gtk_widget_show_all (dialog->dialog);
|
||||
gtk_widget_show_all (self->dialog);
|
||||
|
||||
if (!dialog->list)
|
||||
if (!self->list)
|
||||
{
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-spinner");
|
||||
gtk_builder_get_object (self->builder, "ppd-spinner");
|
||||
gtk_widget_show (widget);
|
||||
gtk_spinner_start (GTK_SPINNER (widget));
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "progress-label");
|
||||
gtk_builder_get_object (self->builder, "progress-label");
|
||||
gtk_widget_show (widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
fill_ppds_list (dialog);
|
||||
fill_ppds_list (self);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -288,19 +288,19 @@ ppd_selection_dialog_response_cb (GtkDialog *dialog,
|
|||
gint response_id,
|
||||
gpointer user_data)
|
||||
{
|
||||
PpPPDSelectionDialog *ppd_selection_dialog = (PpPPDSelectionDialog*) user_data;
|
||||
PpPPDSelectionDialog *self = user_data;
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeView *models_treeview;
|
||||
GtkTreeIter iter;
|
||||
|
||||
pp_ppd_selection_dialog_hide (ppd_selection_dialog);
|
||||
pp_ppd_selection_dialog_hide (self);
|
||||
|
||||
ppd_selection_dialog->response = response_id;
|
||||
self->response = response_id;
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
models_treeview = (GtkTreeView*)
|
||||
gtk_builder_get_object (ppd_selection_dialog->builder, "ppd-selection-models-treeview");
|
||||
gtk_builder_get_object (self->builder, "ppd-selection-models-treeview");
|
||||
|
||||
if (models_treeview)
|
||||
{
|
||||
|
|
@ -311,17 +311,15 @@ ppd_selection_dialog_response_cb (GtkDialog *dialog,
|
|||
if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||
{
|
||||
gtk_tree_model_get (model, &iter,
|
||||
PPD_NAMES_COLUMN, &ppd_selection_dialog->ppd_name,
|
||||
PPD_DISPLAY_NAMES_COLUMN, &ppd_selection_dialog->ppd_display_name,
|
||||
PPD_NAMES_COLUMN, &self->ppd_name,
|
||||
PPD_DISPLAY_NAMES_COLUMN, &self->ppd_display_name,
|
||||
-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ppd_selection_dialog->user_callback (GTK_DIALOG (ppd_selection_dialog->dialog),
|
||||
response_id,
|
||||
ppd_selection_dialog->user_data);
|
||||
self->user_callback (GTK_DIALOG (self->dialog), response_id, self->user_data);
|
||||
}
|
||||
|
||||
PpPPDSelectionDialog *
|
||||
|
|
@ -331,18 +329,18 @@ pp_ppd_selection_dialog_new (GtkWindow *parent,
|
|||
UserResponseCallback user_callback,
|
||||
gpointer user_data)
|
||||
{
|
||||
PpPPDSelectionDialog *dialog;
|
||||
PpPPDSelectionDialog *self;
|
||||
GtkWidget *widget;
|
||||
g_autoptr(GError) error = NULL;
|
||||
gchar *objects[] = { "ppd-selection-dialog", NULL };
|
||||
guint builder_result;
|
||||
|
||||
dialog = g_new0 (PpPPDSelectionDialog, 1);
|
||||
self = g_new0 (PpPPDSelectionDialog, 1);
|
||||
|
||||
dialog->builder = gtk_builder_new ();
|
||||
dialog->parent = GTK_WIDGET (parent);
|
||||
self->builder = gtk_builder_new ();
|
||||
self->parent = GTK_WIDGET (parent);
|
||||
|
||||
builder_result = gtk_builder_add_objects_from_resource (dialog->builder,
|
||||
builder_result = gtk_builder_add_objects_from_resource (self->builder,
|
||||
"/org/gnome/control-center/printers/ppd-selection-dialog.ui",
|
||||
objects, &error);
|
||||
|
||||
|
|
@ -352,71 +350,71 @@ pp_ppd_selection_dialog_new (GtkWindow *parent,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
dialog->dialog = (GtkWidget *) gtk_builder_get_object (dialog->builder, "ppd-selection-dialog");
|
||||
dialog->user_callback = user_callback;
|
||||
dialog->user_data = user_data;
|
||||
self->dialog = (GtkWidget *) gtk_builder_get_object (self->builder, "ppd-selection-dialog");
|
||||
self->user_callback = user_callback;
|
||||
self->user_data = user_data;
|
||||
|
||||
dialog->response = GTK_RESPONSE_NONE;
|
||||
dialog->list = ppd_list_copy (ppd_list);
|
||||
self->response = GTK_RESPONSE_NONE;
|
||||
self->list = ppd_list_copy (ppd_list);
|
||||
|
||||
dialog->manufacturer = get_standard_manufacturers_name (manufacturer);
|
||||
self->manufacturer = get_standard_manufacturers_name (manufacturer);
|
||||
|
||||
/* connect signals */
|
||||
g_signal_connect (dialog->dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
|
||||
g_signal_connect (dialog->dialog, "response", G_CALLBACK (ppd_selection_dialog_response_cb), dialog);
|
||||
g_signal_connect (self->dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
|
||||
g_signal_connect (self->dialog, "response", G_CALLBACK (ppd_selection_dialog_response_cb), self);
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (parent));
|
||||
gtk_window_set_transient_for (GTK_WINDOW (self->dialog), GTK_WINDOW (parent));
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (dialog->builder, "ppd-spinner");
|
||||
gtk_builder_get_object (self->builder, "ppd-spinner");
|
||||
gtk_spinner_start (GTK_SPINNER (widget));
|
||||
|
||||
populate_dialog (dialog);
|
||||
populate_dialog (self);
|
||||
|
||||
gtk_window_present (GTK_WINDOW (dialog->dialog));
|
||||
gtk_widget_show_all (GTK_WIDGET (dialog->dialog));
|
||||
gtk_window_present (GTK_WINDOW (self->dialog));
|
||||
gtk_widget_show_all (GTK_WIDGET (self->dialog));
|
||||
|
||||
return dialog;
|
||||
return self;
|
||||
}
|
||||
|
||||
void
|
||||
pp_ppd_selection_dialog_free (PpPPDSelectionDialog *dialog)
|
||||
pp_ppd_selection_dialog_free (PpPPDSelectionDialog *self)
|
||||
{
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog->dialog));
|
||||
gtk_widget_destroy (GTK_WIDGET (self->dialog));
|
||||
|
||||
g_object_unref (dialog->builder);
|
||||
g_object_unref (self->builder);
|
||||
|
||||
g_free (dialog->ppd_name);
|
||||
g_free (self->ppd_name);
|
||||
|
||||
g_free (dialog->ppd_display_name);
|
||||
g_free (self->ppd_display_name);
|
||||
|
||||
g_free (dialog->manufacturer);
|
||||
g_free (self->manufacturer);
|
||||
|
||||
g_free (dialog);
|
||||
g_free (self);
|
||||
}
|
||||
|
||||
gchar *
|
||||
pp_ppd_selection_dialog_get_ppd_name (PpPPDSelectionDialog *dialog)
|
||||
pp_ppd_selection_dialog_get_ppd_name (PpPPDSelectionDialog *self)
|
||||
{
|
||||
return g_strdup (dialog->ppd_name);
|
||||
return g_strdup (self->ppd_name);
|
||||
}
|
||||
|
||||
gchar *
|
||||
pp_ppd_selection_dialog_get_ppd_display_name (PpPPDSelectionDialog *dialog)
|
||||
pp_ppd_selection_dialog_get_ppd_display_name (PpPPDSelectionDialog *self)
|
||||
{
|
||||
return g_strdup (dialog->ppd_display_name);
|
||||
return g_strdup (self->ppd_display_name);
|
||||
}
|
||||
|
||||
void
|
||||
pp_ppd_selection_dialog_set_ppd_list (PpPPDSelectionDialog *dialog,
|
||||
pp_ppd_selection_dialog_set_ppd_list (PpPPDSelectionDialog *self,
|
||||
PPDList *list)
|
||||
{
|
||||
dialog->list = list;
|
||||
fill_ppds_list (dialog);
|
||||
self->list = list;
|
||||
fill_ppds_list (self);
|
||||
}
|
||||
|
||||
static void
|
||||
pp_ppd_selection_dialog_hide (PpPPDSelectionDialog *dialog)
|
||||
pp_ppd_selection_dialog_hide (PpPPDSelectionDialog *self)
|
||||
{
|
||||
gtk_widget_hide (GTK_WIDGET (dialog->dialog));
|
||||
gtk_widget_hide (GTK_WIDGET (self->dialog));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue