rpm/nemo
SHA256
1
0
Fork 0
forked from pool/nemo
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=37

Browse Source
This commit is contained in:
Marguerite Su 2013-10-22 15:03:03 +00:00 committed by Git OBS Bridge
parent 881f6a1f75
commit c8c04eaa86
1 changed files with 406 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

409
nemo-2.0.1-GTK_STOCK.patch
View File

@ -26,7 +26,7 @@ Index: nemo-2.0.1/eel/eel-stock-dialogs.c
/* Put up the timed wait window. */
- button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK;
+ button = wait->cancel_callback != NULL ? _("_Cancel") : _("_OK");
+ button = wait->cancel_callback != NULL ? _("_Cancel") : _("_OK")
dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
0,
GTK_MESSAGE_INFO,
@ -62,7 +62,7 @@ Index: nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c
/* Setup the dialog image */
- widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+ widget = gtk_image_new_from_stock ("dialog-warning",
+ widget = gtk_image_new_from_icon_name ("dialog-warning",
GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0);
@ -71,7 +71,7 @@ Index: nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c
widget = gtk_button_new_with_label (_("Reset"));
gtk_button_set_image (GTK_BUTTON (widget),
- gtk_image_new_from_stock (GTK_STOCK_UNDO,
+ gtk_image_new_from_stock ("edit-undo",
+ gtk_image_new_from_icon_name ("edit-undo",
GTK_ICON_SIZE_MENU));
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6);
g_signal_connect (widget, "clicked",
@ -84,3 +84,406 @@ Index: nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c
GTK_RESPONSE_CANCEL,
_("_Skip"),
CONFLICT_RESPONSE_SKIP,
Index: nemo-2.0.1/libnemo-private/nemo-action.c
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-action.c
+++ nemo-2.0.1/libnemo-private/nemo-action.c
@@ -26,7 +26,7 @@
#include <libnemo-private/nemo-debug.h>
G_DEFINE_TYPE (NemoAction, nemo_action,
- GTK_TYPE_ACTION);
+ G_TYPE_ACTION);
static void nemo_action_init (NemoAction *action);
@@ -1346,4 +1346,4 @@ nemo_action_get_visibility (NemoAction *
out:
return selection_type_show && extension_type_show && condition_type_show;
-}
\ No newline at end of file
+}
Index: nemo-2.0.1/libnemo-private/nemo-action.h
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-action.h
+++ nemo-2.0.1/libnemo-private/nemo-action.h
@@ -81,7 +81,7 @@ typedef enum {
} TokenType;
struct _NemoAction {
- GtkAction parent;
+ GAction parent;
gchar *key_file_path;
SelectionType selection_type;
gchar **extensions;
@@ -101,7 +101,7 @@ struct _NemoAction {
};
struct _NemoActionClass {
- GtkActionClass parent_class;
+ GActionClass parent_class;
};
GType nemo_action_get_type (void);
Index: nemo-2.0.1/libnemo-private/nemo-bookmark.c
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-bookmark.c
+++ nemo-2.0.1/libnemo-private/nemo-bookmark.c
@@ -205,7 +205,7 @@ nemo_bookmark_set_icon_to_default (NemoB
if (nemo_bookmark_uri_known_not_to_exist (bookmark)) {
DEBUG ("%s: file does not exist, add emblem", nemo_bookmark_get_name (bookmark));
- icon = g_themed_icon_new (GTK_STOCK_DIALOG_WARNING);
+ icon = g_themed_icon_new ("dialog-warning");
emblem = g_emblem_new (icon);
emblemed_icon = g_emblemed_icon_new (folder, emblem);
Index: nemo-2.0.1/libnemo-private/nemo-column-chooser.c
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-column-chooser.c
+++ nemo-2.0.1/libnemo-private/nemo-column-chooser.c
@@ -342,13 +342,13 @@ use_default_clicked_callback (GtkWidget
}
static GtkWidget *
-button_new_with_mnemonic (const gchar *stockid, const gchar *str)
+button_new_with_mnemonic (const gchar *icon_name, const gchar *str)
{
GtkWidget *image;
GtkWidget *button;
button = gtk_button_new_with_mnemonic (str);
- image = gtk_image_new_from_stock (stockid, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
@@ -364,7 +364,7 @@ add_buttons (NemoColumnChooser *chooser)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (box);
- chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP,
+ chooser->details->move_up_button = button_new_with_mnemonic ("go-up",
_("Move _Up"));
g_signal_connect (chooser->details->move_up_button,
"clicked", G_CALLBACK (move_up_clicked_callback),
@@ -374,7 +374,7 @@ add_buttons (NemoColumnChooser *chooser)
gtk_box_pack_start (GTK_BOX (box), chooser->details->move_up_button,
FALSE, FALSE, 0);
- chooser->details->move_down_button = button_new_with_mnemonic (GTK_STOCK_GO_DOWN,
+ chooser->details->move_down_button = button_new_with_mnemonic ("go-down",
_("Move Dow_n"));
g_signal_connect (chooser->details->move_down_button,
"clicked", G_CALLBACK (move_down_clicked_callback),
Index: nemo-2.0.1/libnemo-private/nemo-file-operations.c
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-file-operations.c
+++ nemo-2.0.1/libnemo-private/nemo-file-operations.c
@@ -1325,7 +1325,7 @@ confirm_delete_from_trash (CommonJob *jo
f (_("If you delete an item, it will be permanently lost.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+ _("_Cancel"), _("_Delete"),
NULL);
return (response == 1);
@@ -1349,7 +1349,7 @@ confirm_empty_trash (CommonJob *job)
f(_("All items in the Trash will be permanently deleted.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, _("Empty _Trash"),
+ _("_Cancel"), _("Empty _Trash"),
NULL);
return (response == 1);
@@ -1391,7 +1391,7 @@ confirm_delete_directly (CommonJob *job,
f (_("If you delete an item, it will be permanently lost.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+ _("_Cancel"), _("_Delete"),
NULL);
return response == 1;
@@ -1525,7 +1525,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, _("_Skip files"),
+ _("_Cancel"), _("_Skip files"),
NULL);
g_error_free (error);
@@ -1558,7 +1558,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ _("_Cancel"), SKIP, RETRY,
NULL);
g_error_free (error);
@@ -1591,7 +1591,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -1668,7 +1668,7 @@ delete_file (CommonJob *job, GFile *file
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -1805,7 +1805,7 @@ trash_files (CommonJob *job, GList *file
secondary,
details,
(total_files - files_trashed) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, DELETE_ALL, GTK_STOCK_DELETE,
+ _("_Cancel"), SKIP_ALL, SKIP, DELETE_ALL, _("_Delete"),
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -2207,7 +2207,7 @@ prompt_empty_trash (GtkWindow *parent_wi
"will be permanently lost."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Do _not Empty Trash"), GTK_RESPONSE_REJECT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */
@@ -2529,7 +2529,7 @@ scan_dir (GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, RETRY, SKIP,
+ _("_Cancel"), RETRY, SKIP,
NULL);
g_error_free (error);
@@ -2570,7 +2570,7 @@ scan_dir (GFile *dir,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY,
+ _("_Cancel"), SKIP_ALL, SKIP, RETRY,
NULL);
g_error_free (error);
@@ -2647,7 +2647,7 @@ scan_file (GFile *file,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY,
+ _("_Cancel"), SKIP_ALL, SKIP, RETRY,
NULL);
g_error_free (error);
@@ -2752,7 +2752,7 @@ verify_destination (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ _("_Cancel"), RETRY,
NULL);
g_error_free (error);
@@ -2787,7 +2787,7 @@ verify_destination (CommonJob *job,
secondary,
NULL,
FALSE,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
NULL);
abort_job (job);
@@ -2823,7 +2823,7 @@ verify_destination (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
COPY_FORCE,
RETRY,
NULL);
@@ -2851,7 +2851,7 @@ verify_destination (CommonJob *job,
secondary,
NULL,
FALSE,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
NULL);
g_error_free (error);
@@ -3384,7 +3384,7 @@ create_dest_dir (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ _("_Cancel"), SKIP, RETRY,
NULL);
g_error_free (error);
@@ -3517,7 +3517,7 @@ copy_move_directory (CopyMoveJob *copy_j
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, _("_Skip files"),
+ _("_Cancel"), _("_Skip files"),
NULL);
g_error_free (error);
@@ -3562,7 +3562,7 @@ copy_move_directory (CopyMoveJob *copy_j
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ _("_Cancel"), SKIP, RETRY,
NULL);
g_error_free (error);
@@ -3604,7 +3604,7 @@ copy_move_directory (CopyMoveJob *copy_j
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -3693,7 +3693,7 @@ remove_target_recursively (CommonJob *jo
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -3734,7 +3734,7 @@ remove_target_recursively (CommonJob *jo
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4052,7 +4052,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
NULL,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4085,7 +4085,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
NULL,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4303,7 +4303,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -4370,7 +4370,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -4755,7 +4755,7 @@ move_file_prepare (CopyMoveJob *move_job
secondary,
NULL,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4910,7 +4910,7 @@ move_file_prepare (CopyMoveJob *move_job
secondary,
details,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -5355,7 +5355,7 @@ link_file (CopyMoveJob *job,
secondary,
details,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ _("_Cancel"), SKIP_ALL, SKIP,
NULL);
if (error) {
@@ -6132,7 +6132,7 @@ create_job (GIOSchedulerJob *io_job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP,
+ _("_Cancel"), SKIP,
NULL);
g_error_free (error);
@@ -6445,7 +6445,7 @@ mark_desktop_file_trusted (CommonJob *co
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ _("_Cancel"), RETRY,
NULL);
} else {
response = 0;
@@ -6486,7 +6486,7 @@ mark_desktop_file_trusted (CommonJob *co
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ _("_Cancel"), RETRY,
NULL);
} else {
response = 0;
@@ -6521,7 +6521,7 @@ mark_desktop_file_trusted (CommonJob *co
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ _("_Cancel"), RETRY,
NULL);
} else {
response = 0;
@@ -6556,7 +6556,7 @@ mark_desktop_file_trusted (CommonJob *co
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ _("_Cancel"), RETRY,
NULL);
} else {
response = 0;