From e334c469dc366b62bca243c6116b6d4ef45d8bf2699b9914a6a5f1eb76bbc8e9 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 22 Oct 2013 12:36:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=31 --- nemo-2.0.1-GTK_STOCK.patch | 73 ++++++++++++++++++++++++++++++++++++-- nemo.spec | 3 +- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/nemo-2.0.1-GTK_STOCK.patch b/nemo-2.0.1-GTK_STOCK.patch index fc4e8df..df7f663 100644 --- a/nemo-2.0.1-GTK_STOCK.patch +++ b/nemo-2.0.1-GTK_STOCK.patch @@ -7,13 +7,80 @@ Index: nemo-2.0.1/eel/eel-editable-label.c clipboard_contains_text = gtk_selection_data_targets_include_text (data); - append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard", -+ append_action_signal (label, label->popup_menu, "Cu_t", "cut_clipboard", ++ append_action_signal (label, label->popup_menu, _("Cu_t"), "cut_clipboard", have_selection); - append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard", -+ append_action_signal (label, label->popup_menu, "_Copy", "copy_clipboard", ++ append_action_signal (label, label->popup_menu, _("_Copy"), "copy_clipboard", have_selection); - append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", -+ append_action_signal (label, label->popup_menu, "_Paste", "paste_clipboard", ++ append_action_signal (label, label->popup_menu, _("_Paste"), "paste_clipboard", clipboard_contains_text); menuitem = gtk_menu_item_new_with_label (_("Select All")); +Index: nemo-2.0.1/eel/eel-stock-dialogs.c +=================================================================== +--- nemo-2.0.1.orig/eel/eel-stock-dialogs.c ++++ nemo-2.0.1/eel/eel-stock-dialogs.c +@@ -193,7 +193,7 @@ timed_wait_callback (gpointer callback_d + wait = callback_data; + + /* Put up the timed wait window. */ +- button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK; ++ button = wait->cancel_callback != NULL ? _("_Cancel") : _("_OK"); + dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window, + 0, + GTK_MESSAGE_INFO, +Index: nemo-2.0.1/libnemo-private/nemo-clipboard.c +=================================================================== +--- nemo-2.0.1.orig/libnemo-private/nemo-clipboard.c ++++ nemo-2.0.1/libnemo-private/nemo-clipboard.c +@@ -428,15 +428,15 @@ target_data_free (TargetCallbackData *ta + } + + static const GtkActionEntry clipboard_entries[] = { +- /* name, stock id */ { "Cut", GTK_STOCK_CUT, ++ /* name, stock id */ { "Cut", _("Cu_t"), + /* label, accelerator */ NULL, NULL, + /* tooltip */ N_("Cut the selected text to the clipboard"), + G_CALLBACK (action_cut_callback) }, +- /* name, stock id */ { "Copy", GTK_STOCK_COPY, ++ /* name, stock id */ { "Copy", _("_Copy"), + /* label, accelerator */ NULL, NULL, + /* tooltip */ N_("Copy the selected text to the clipboard"), + G_CALLBACK (action_copy_callback) }, +- /* name, stock id */ { "Paste", GTK_STOCK_PASTE, ++ /* name, stock id */ { "Paste", _("_Paste"), + /* label, accelerator */ NULL, NULL, + /* tooltip */ N_("Paste the text stored on the clipboard"), + G_CALLBACK (action_paste_callback) }, +Index: nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c +=================================================================== +--- nemo-2.0.1.orig/libnemo-private/nemo-file-conflict-dialog.c ++++ nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c +@@ -472,7 +472,7 @@ nemo_file_conflict_dialog_init (NemoFile + gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); + + /* Setup the dialog image */ +- widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, ++ widget = gtk_image_new_from_stock ("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); +@@ -518,7 +518,7 @@ nemo_file_conflict_dialog_init (NemoFile + + 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_ICON_SIZE_MENU)); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6); + g_signal_connect (widget, "clicked", +@@ -537,7 +537,7 @@ nemo_file_conflict_dialog_init (NemoFile + + /* Add buttons */ + gtk_dialog_add_buttons (dialog, +- GTK_STOCK_CANCEL, ++ _("_Cancel"), + GTK_RESPONSE_CANCEL, + _("_Skip"), + CONFLICT_RESPONSE_SKIP, diff --git a/nemo.spec b/nemo.spec index 9478494..e0fc3d5 100644 --- a/nemo.spec +++ b/nemo.spec @@ -37,6 +37,7 @@ BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme +BuildRequires: sed BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) @@ -54,7 +55,7 @@ BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(polkit-agent-1) # wise detect Tumbleweed -%if 0%{?suse_version} <= 1230 +%if 0%{?suse_version} < 1230 BuildRequires: pkgconfig(tracker-sparql-0.14) %else BuildRequires: pkgconfig(tracker-sparql-0.16)