← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nautilus/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/06_never_exec_nonexec_launchers.patch/src/nautilus-mime-actions.c

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
https://launchpad.net/bugs/1272602
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/06_never_exec_nonexec_launchers.patch/src/nautilus-mime-actions.c
258
258
}
259
259
 
260
260
static GList*
261
 
filter_no_show_apps (GList *apps)
262
 
{
263
 
        GList *l, *next;
264
 
        GAppInfo *application;
265
 
 
266
 
        l = apps;
267
 
        while (l != NULL) {
268
 
                application = (GAppInfo *) l->data;
269
 
                next = l->next;
270
 
 
271
 
                if (!g_app_info_should_show (application)) {
272
 
                        g_object_unref (application);
273
 
                        apps = g_list_delete_link (apps, l);
274
 
                }
275
 
 
276
 
                l = next;
277
 
        }
278
 
 
279
 
        return apps;
280
 
}
281
 
 
282
 
static GList*
283
261
filter_non_uri_apps (GList *apps,
284
262
                     gboolean accept_files)
285
263
{
470
448
                g_free (uri_scheme);
471
449
        }
472
450
 
473
 
        result = filter_no_show_apps (result);
474
 
 
475
451
        /* Filter out non-uri supporting apps */
476
452
        result = filter_non_uri_apps (result, file_has_local_path (file));
477
453
 
669
645
        
670
646
        if (!can_trash) {
671
647
                eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING,
672
 
                                       prompt, detail, GTK_STOCK_CANCEL, NULL);
 
648
                                       prompt, detail, _("_Cancel"), NULL);
673
649
                goto out;
674
650
        }
675
651
 
676
 
        dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
 
652
        dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), _("_Cancel"),
677
653
                                         parent_window);
678
654
 
679
655
        gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
744
720
                                             _("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
745
721
                                             _("_Display"), RESPONSE_DISPLAY,
746
722
                                             parent_window);
747
 
        gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 
723
        gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL);
748
724
        gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
749
725
        gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
750
726
        gtk_widget_show (GTK_WIDGET (dialog));
1087
1063
                                                   "This will open %d separate windows.", count), count);
1088
1064
        }
1089
1065
        dialog = eel_show_yes_no_dialog (prompt, detail, 
1090
 
                                         GTK_STOCK_OK, GTK_STOCK_CANCEL,
 
1066
                                         _("_OK"), _("_Cancel"),
1091
1067
                                         parent_window);
1092
1068
        g_free (detail);
1093
1069
 
1264
1240
 
1265
1241
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Select Application"), GTK_RESPONSE_ACCEPT);
1266
1242
 
1267
 
        gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
 
1243
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_OK);
1268
1244
 
1269
1245
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
1270
1246
 
1593
1569
                                               _("Mark as _Trusted"), RESPONSE_MARK_TRUSTED);
1594
1570
                }
1595
1571
                gtk_dialog_add_button (GTK_DIALOG (dialog),
1596
 
                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 
1572
                                       _("_Cancel"), GTK_RESPONSE_CANCEL);
1597
1573
                gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
1598
1574
 
1599
1575
                g_signal_connect (dialog, "response",
1817
1793
                detail = g_strdup_printf (ngettext ("This will open %d separate application.",
1818
1794
                                                    "This will open %d separate applications.", num_apps), num_apps);
1819
1795
                dialog = eel_show_yes_no_dialog (prompt, detail,
1820
 
                                                 GTK_STOCK_OK, GTK_STOCK_CANCEL,
 
1796
                                                 _("_OK"), _("_Cancel"),
1821
1797
                                                 parameters->parent_window);
1822
1798
                g_free (detail);
1823
1799