← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gthumb/trusty

« back to all changes in this revision

Viewing changes to extensions/red_eye_removal/gth-file-tool-red-eye.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2013-08-31 06:24:51 UTC
  • mfrom: (1.3.17) (5.2.24 sid)
  • Revision ID: package-import@ubuntu.com-20130831062451-0958soi720z0byp6
Tags: 3:3.2.5-1
http://bugs.debian.org/716729
https://launchpad.net/bugs/1201073
http://bugs.debian.org/711827
http://bugs.debian.org/697087
* New upstream release. Closes: #716729 LP: #1201073
* Set myself as maintainer. Closes: #711827
* debian/control:
  - Build-depend on yelp-tools, libgstreamer1.0-dev, libsecret-1-dev,
    libgstreamer-plugins-base1.0-dev, libwebp-dev
  - Bump standards-version to 3.9.4
  - Bump debhelper to 8
  - Make git URLs canonical
  - Drop depend on libiptcdata0-dev. Closes: #697087
  - Drop depend on gnome keyring since libsecret replaces it
* debian/compat: Set as 8
* debian/rules: 
  - Add --enable-libwebp for WebP support
  - Add --disable-silent-rules for verbose building
  - Enable hardening
* Create debian/source/options
* Refresh all patches so they apply cleanly

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/red_eye_removal/gth-file-tool-red-eye.c
83
83
}
84
84
 
85
85
 
86
 
static void
87
 
cancel_button_clicked_cb (GtkButton         *button,
88
 
                          GthFileToolRedEye *self)
89
 
{
90
 
        GtkWidget *window;
91
 
        GtkWidget *viewer_page;
92
 
        GtkWidget *viewer;
93
 
 
94
 
        window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
95
 
        viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
96
 
        viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page));
97
 
 
98
 
        gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (viewer), self->priv->original_zoom_change);
99
 
        gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page));
100
 
        gth_file_tool_hide_options (GTH_FILE_TOOL (self));
101
 
}
102
 
 
103
 
 
104
86
static int
105
87
find_region (int   row,
106
88
             int   col,
404
386
        self->priv->builder = _gtk_builder_new_from_file ("red-eye-removal-options.ui", "red_eye_removal");
405
387
        options = _gtk_builder_get_widget (self->priv->builder, "options");
406
388
        gtk_widget_show (options);
407
 
        g_signal_connect (GET_WIDGET ("cancel_button"),
408
 
                          "clicked",
409
 
                          G_CALLBACK (cancel_button_clicked_cb),
410
 
                          self);
 
389
        g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
 
390
                                  "clicked",
 
391
                                  G_CALLBACK (gth_file_tool_cancel),
 
392
                                  self);
411
393
        g_signal_connect (GET_WIDGET ("ok_button"),
412
394
                          "clicked",
413
395
                          G_CALLBACK (ok_button_clicked_cb),
463
445
 
464
446
 
465
447
static void
 
448
gth_file_tool_red_eye_cancel (GthFileTool *base)
 
449
{
 
450
        GthFileToolRedEye *self = (GthFileToolRedEye *) base;
 
451
        GtkWidget         *window;
 
452
        GtkWidget         *viewer_page;
 
453
        GtkWidget         *viewer;
 
454
 
 
455
        window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
 
456
        viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
 
457
        viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page));
 
458
 
 
459
        gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (viewer), self->priv->original_zoom_change);
 
460
        gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page));
 
461
}
 
462
 
 
463
 
 
464
static void
466
465
gth_file_tool_red_eye_finalize (GObject *object)
467
466
{
468
467
        GthFileToolRedEye *self;
496
495
        file_tool_class = (GthFileToolClass *) class;
497
496
        file_tool_class->update_sensitivity = gth_file_tool_red_eye_update_sensitivity;
498
497
        file_tool_class->activate = gth_file_tool_red_eye_activate;
 
498
        file_tool_class->cancel = gth_file_tool_red_eye_cancel;
499
499
        file_tool_class->get_options = gth_file_tool_red_eye_get_options;
500
500
        file_tool_class->destroy_options = gth_file_tool_red_eye_destroy_options;
501
501
}