← Back to branch summary

~ubuntu-branches/ubuntu/edgy/gimp/edgy-proposed

« back to all changes in this revision

Viewing changes to app/dialogs/file-save-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2006-08-28 16:54:33 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060828165433-4a009iph3a8lq78s
Tags: 2.2.13-1ubuntu1
* Sync with Debian
* New upstream version, UVF exception granted by Colin Watson
* debian/patches/10_dont_show_wizard.patch:
  - don't use the setup wizard on first run
* debian/rules:
  - add gettext domain to the .desktop
  - run "intltool-update -p" for the different po directories of the package

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/dialogs/file-save-dialog.c
139
139
        }
140
140
      else
141
141
        {
 
142
          gulong handler_id;
 
143
 
142
144
          gimp_file_dialog_set_sensitive (dialog, FALSE);
 
145
          handler_id = g_signal_connect (dialog, "destroy",
 
146
                                         G_CALLBACK (gtk_widget_destroyed),
 
147
                                         &dialog);
143
148
 
144
149
          if (file_save_dialog_save_image (save_dialog,
145
150
                                           dialog->gimage,
148
153
                                           dialog->file_proc,
149
154
                                           dialog->save_a_copy))
150
155
            {
151
 
              gtk_widget_hide (save_dialog);
 
156
              if (dialog)
 
157
                gtk_widget_hide (save_dialog);
152
158
            }
153
159
 
154
 
          gimp_file_dialog_set_sensitive (dialog, TRUE);
 
160
          if (dialog)
 
161
            {
 
162
              gimp_file_dialog_set_sensitive (dialog, TRUE);
 
163
              g_signal_handler_disconnect (dialog, handler_id);
 
164
            }
155
165
        }
156
166
 
157
167
      g_free (filename);
181
191
  overwrite_data->uri          = g_strdup (uri);
182
192
  overwrite_data->raw_filename = g_strdup (raw_filename);
183
193
 
184
 
  dialog =
185
 
    gimp_message_dialog_new (_("File exists"), GIMP_STOCK_WARNING,
186
 
                             save_dialog, 0,
187
 
                             gimp_standard_help_func, NULL,
188
 
 
189
 
                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
190
 
                             _("_Replace"),    GTK_RESPONSE_OK,
191
 
 
192
 
                             NULL);
 
194
  dialog = gimp_message_dialog_new (_("File exists"), GIMP_STOCK_WARNING,
 
195
                                    save_dialog, GTK_DIALOG_DESTROY_WITH_PARENT,
 
196
                                    gimp_standard_help_func, NULL,
 
197
 
 
198
                                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 
199
                                    _("_Replace"),    GTK_RESPONSE_OK,
 
200
 
 
201
                                    NULL);
193
202
 
194
203
  g_signal_connect (dialog, "response",
195
204
                    G_CALLBACK (file_save_overwrite_response),