← Back to branch summary

~ubuntu-branches/debian/sid/claws-mail/sid

« back to all changes in this revision

Viewing changes to src/plugins/archive/archiver_prefs.c

  • Committer: Package Import Robot
  • Author(s): Ricardo Mones
  • Date: 2015-08-18 16:37:25 UTC
  • mfrom: (1.3.7)
  • Revision ID: package-import@ubuntu.com-20150818163725-1it32n9mzqkwy2ef
Tags: 3.12.0-1
http://bugs.debian.org/777208
http://bugs.debian.org/778886
http://bugs.debian.org/779824
http://bugs.debian.org/793665
* New upstream release:
- 'cannot reorganize mailboxes' (Closes: #777208)
- 'dropdown menu bar has disappeared…'(Closes: #778886)
- 'depends on plugins libraries'  (Closes: #779824)
- 'new upstream version (3.12.0)…' (Closes: #793665)
* 14CVE_2010_5109.patch, 15fix_crash_open_folder.patch,
  13desktop_file_categories.patch
- Remove patches applied upstream
* debian/control, debian/copyright, debian/claws-mail-managesieve*
- Add managesieve plugin (new in this release)
* debian/rules
- Set perl-plugin manpage release version automatically
* 12fix_manpage_header.patch
- Update patch to cope with upstream changes
* debian/control, debian/watch
- Update VCS-* and watch URLs (thanks Julian Wollrath)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/archive/archiver_prefs.c
50
50
        gint compression;
51
51
        GtkWidget *zip_radiobtn;
52
52
        GtkWidget *bzip_radiobtn;
53
 
#if NEW_ARCHIVE_API
54
 
        GtkWidget *compress_radiobtn;
55
 
#endif
 
53
    GtkWidget *compress_radiobtn;
56
54
        GtkWidget *none_radiobtn;
57
55
        GtkWidget *tar_radiobtn;
58
56
        GtkWidget *shar_radiobtn;
161
159
        GSList    *compression_group = NULL;
162
160
        GtkWidget *zip_radiobtn;
163
161
        GtkWidget *bzip_radiobtn;
164
 
#if NEW_ARCHIVE_API
165
 
        GtkWidget *compress_radiobtn;
166
 
#endif
 
162
    GtkWidget *compress_radiobtn;
167
163
        GtkWidget *none_radiobtn;
168
164
        GSList    *format_group = NULL;
169
165
        GtkWidget *tar_radiobtn;
229
225
        CLAWS_SET_TIP(bzip_radiobtn,
230
226
                        _("Choose this option to use BZIP2 compression by default"));
231
227
 
232
 
#if NEW_ARCHIVE_API
233
228
        compress_radiobtn = gtk_radio_button_new_with_label(compression_group, "COMPRESS");
234
229
        compression_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(compress_radiobtn));
235
230
        gtk_widget_show(compress_radiobtn);
236
231
        gtk_box_pack_start(GTK_BOX (hbox1), compress_radiobtn, FALSE, FALSE, 0);
237
232
        CLAWS_SET_TIP(compress_radiobtn,
238
233
                        _("Choose this option to use COMPRESS compression by default"));
239
 
#endif
240
234
 
241
 
        none_radiobtn = gtk_radio_button_new_with_label(compression_group, _("None"));
 
235
    none_radiobtn = gtk_radio_button_new_with_label(compression_group, _("None"));
242
236
        compression_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(none_radiobtn));
243
237
        gtk_widget_show(none_radiobtn);
244
238
        gtk_box_pack_start(GTK_BOX (hbox1), none_radiobtn, FALSE, FALSE, 0);
252
246
        case COMPRESSION_BZIP:
253
247
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bzip_radiobtn), TRUE);
254
248
                break;
255
 
#if NEW_ARCHIVE_API
256
 
        case COMPRESSION_COMPRESS:       
 
249
    case COMPRESSION_COMPRESS:       
257
250
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compress_radiobtn), TRUE);
258
251
                break;
259
 
#endif
260
252
        case COMPRESSION_NONE:
261
253
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(none_radiobtn), TRUE);
262
254
                break;
351
343
        page->save_folder = save_folder;
352
344
        page->zip_radiobtn = zip_radiobtn;
353
345
        page->bzip_radiobtn = bzip_radiobtn;
354
 
#if NEW_ARCHIVE_API
355
 
        page->compress_radiobtn = compress_radiobtn;
356
 
#endif
 
346
    page->compress_radiobtn = compress_radiobtn;
357
347
        page->none_radiobtn = none_radiobtn;
358
348
        page->tar_radiobtn = tar_radiobtn;
359
349
        page->shar_radiobtn = shar_radiobtn;
384
374
                archiver_prefs.compression = COMPRESSION_ZIP;
385
375
        else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->bzip_radiobtn)))
386
376
                archiver_prefs.compression = COMPRESSION_BZIP;
387
 
#if NEW_ARCHIVE_API
388
377
        else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->compress_radiobtn)))
389
378
                archiver_prefs.compression = COMPRESSION_COMPRESS;
390
 
#endif
391
379
        else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->none_radiobtn)))
392
380
                archiver_prefs.compression = COMPRESSION_NONE;
393
381