[gnome-screenshot/wip/exalm/cleanups: 8/15] interactive-dialog: Name dialog self in _new()



commit dd7de24074399c1085c58ec99e6a96972f44ecf7
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Apr 3 06:58:50 2020 +0500

    interactive-dialog: Name dialog self in _new()

 src/screenshot-interactive-dialog.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/screenshot-interactive-dialog.c b/src/screenshot-interactive-dialog.c
index 8e5ceea..f2753ad 100644
--- a/src/screenshot-interactive-dialog.c
+++ b/src/screenshot-interactive-dialog.c
@@ -181,27 +181,28 @@ GtkWidget *
 screenshot_interactive_dialog_new (CaptureClickedCallback f,
                                    gpointer               user_data)
 {
-  ScreenshotApplication *self = user_data;
-  ScreenshotInteractiveDialog *dialog;
+  ScreenshotApplication *app = user_data;
+  ScreenshotInteractiveDialog *self;
 
-  dialog = g_object_new (SCREENSHOT_TYPE_INTERACTIVE_DIALOG, NULL);
-  gtk_window_set_application (GTK_WINDOW (dialog), GTK_APPLICATION (self));
+  self = g_object_new (SCREENSHOT_TYPE_INTERACTIVE_DIALOG,
+                       "application", app,
+                       NULL);
 
-  dialog->callback = f;
-  dialog->user_data = user_data;
+  self->callback = f;
+  self->user_data = user_data;
 
-  gtk_widget_show_all (GTK_WIDGET (dialog));
+  gtk_widget_show_all (GTK_WIDGET (self));
 
   if (screenshot_config->take_window_shot)
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->window), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->window), TRUE);
 
   if (screenshot_config->take_area_shot)
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->selection), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->selection), TRUE);
 
-  gtk_widget_set_sensitive (dialog->pointer_row, !screenshot_config->take_area_shot);
-  gtk_switch_set_active (GTK_SWITCH (dialog->pointer), screenshot_config->include_pointer);
+  gtk_widget_set_sensitive (self->pointer_row, !screenshot_config->take_area_shot);
+  gtk_switch_set_active (GTK_SWITCH (self->pointer), screenshot_config->include_pointer);
 
-  gtk_adjustment_set_value (dialog->delay_adjustment, (gdouble) screenshot_config->delay);
+  gtk_adjustment_set_value (self->delay_adjustment, (gdouble) screenshot_config->delay);
 
-  return GTK_WIDGET (dialog);
+  return GTK_WIDGET (self);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]