diff --git a/nemo-2.0.3-GTK_STOCK.patch b/nemo-2.0.3-GTK_STOCK.patch deleted file mode 100644 index 7a2222c..0000000 --- a/nemo-2.0.3-GTK_STOCK.patch +++ /dev/null @@ -1,991 +0,0 @@ -Index: nemo-2.0.3/eel/eel-editable-label.c -=================================================================== ---- nemo-2.0.3.orig/eel/eel-editable-label.c -+++ nemo-2.0.3/eel/eel-editable-label.c -@@ -2994,11 +2994,11 @@ activate_cb (GtkWidget *menuitem, - static void - append_action_signal (EelEditableLabel *label, - GtkWidget *menu, -- const gchar *stock_id, -+ const gchar *glabel, - const gchar *signal, - gboolean sensitive) - { -- GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); -+ GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (glabel); - - g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal); - g_signal_connect (menuitem, "activate", -@@ -3094,11 +3094,11 @@ popup_targets_received (GtkClipboard - - 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", - have_selection); -- append_action_signal (label, label->popup_menu, GTK_STOCK_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", - clipboard_contains_text); - - menuitem = gtk_menu_item_new_with_label (_("Select All")); -Index: nemo-2.0.3/eel/eel-stock-dialogs.c -=================================================================== ---- nemo-2.0.3.orig/eel/eel-stock-dialogs.c -+++ nemo-2.0.3/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.3/libnemo-private/nemo-action.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-action.c -+++ nemo-2.0.3/libnemo-private/nemo-action.c -@@ -26,7 +26,7 @@ - #include - - 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.3/libnemo-private/nemo-bookmark.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-bookmark.c -+++ nemo-2.0.3/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); -@@ -632,7 +632,7 @@ nemo_bookmark_menu_item_new (NemoBookmar - const char *name; - - name = nemo_bookmark_get_name (bookmark); -- menu_item = gtk_image_menu_item_new_with_label (name); -+ menu_item = gtk_menu_item_new_with_label (name); - label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (menu_item))); - gtk_label_set_use_underline (label, FALSE); - gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); -Index: nemo-2.0.3/libnemo-private/nemo-clipboard.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-clipboard.c -+++ nemo-2.0.3/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.3/libnemo-private/nemo-column-chooser.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-column-chooser.c -+++ nemo-2.0.3/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.3/libnemo-private/nemo-desktop-link-monitor.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-desktop-link-monitor.c -+++ nemo-2.0.3/libnemo-private/nemo-desktop-link-monitor.c -@@ -101,7 +101,7 @@ volume_delete_dialog (GtkWidget *parent_ - dialog_str, - _("If you want to eject the volume, please use \"Eject\" in the " - "popup menu of the volume."), -- GTK_STOCK_OK, NULL); -+ _("_OK"), NULL); - } else { - eel_run_simple_dialog - (parent_view, -@@ -110,7 +110,7 @@ volume_delete_dialog (GtkWidget *parent_ - dialog_str, - _("If you want to unmount the volume, please use \"Unmount Volume\" in the " - "popup menu of the volume."), -- GTK_STOCK_OK, NULL); -+ _("_OK"), NULL); - } - - g_object_unref (mount); -Index: nemo-2.0.3/libnemo-private/nemo-file-conflict-dialog.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-file-conflict-dialog.c -+++ nemo-2.0.3/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_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); -@@ -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_icon_name ("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, -Index: nemo-2.0.3/libnemo-private/nemo-file-operations.c -=================================================================== ---- nemo-2.0.3.orig/libnemo-private/nemo-file-operations.c -+++ nemo-2.0.3/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; -Index: nemo-2.0.3/src/nemo-connect-server-dialog.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-connect-server-dialog.c -+++ nemo-2.0.3/src/nemo-connect-server-dialog.c -@@ -204,7 +204,7 @@ connect_dialog_gvfs_error (NemoConnectSe - gtk_container_add (GTK_CONTAINER (content_area), hbox); - gtk_widget_show (hbox); - -- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR); -+ image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6); - gtk_widget_show (image); - -@@ -256,9 +256,9 @@ iconize_entry (NemoConnectServerDialog * - dialog->details->iconized_entries = - g_list_prepend (dialog->details->iconized_entries, entry); - -- gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), -+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), - GTK_ENTRY_ICON_SECONDARY, -- GTK_STOCK_DIALOG_WARNING); -+ "dialog-warning"); - - gtk_widget_grab_focus (entry); - -@@ -316,7 +316,7 @@ connect_dialog_set_info_bar_error (NemoC - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6); - gtk_widget_show (hbox); - -- icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, -+ icon = gtk_image_new_from_icon_name ("dialog-warning", - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6); - gtk_widget_show (icon); -@@ -391,7 +391,7 @@ connect_dialog_request_additional_detail - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6); - gtk_widget_show (hbox); - -- icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, -+ icon = gtk_image_new_from_icon_name ("dialog-warning", - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6); - gtk_widget_show (icon); -@@ -1100,10 +1100,10 @@ nemo_connect_server_dialog_init (NemoCon - bind_visibility (dialog, dialog->details->password_entry, checkbox); - - gtk_dialog_add_button (GTK_DIALOG (dialog), -- GTK_STOCK_HELP, -+ _("_Help"), - GTK_RESPONSE_HELP); - gtk_dialog_add_button (GTK_DIALOG (dialog), -- GTK_STOCK_CANCEL, -+ _("_Cancel"), - GTK_RESPONSE_CANCEL); - connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - _("C_onnect"), -Index: nemo-2.0.3/src/nemo-location-bar.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-location-bar.c -+++ nemo-2.0.3/src/nemo-location-bar.c -@@ -193,7 +193,7 @@ drag_data_received_callback (GtkWidget * - GTK_MESSAGE_QUESTION, - prompt, - detail, -- GTK_STOCK_CANCEL, GTK_STOCK_OK, -+ _("_Cancel"), _("_OK"), - NULL) != 0 /* GNOME_OK */; - - g_free (prompt); -Index: nemo-2.0.3/src/nemo-mime-actions.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-mime-actions.c -+++ nemo-2.0.3/src/nemo-mime-actions.c -@@ -648,11 +648,11 @@ report_broken_symbolic_link (GtkWindow * - - if (nemo_file_is_in_trash (file)) { - eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING, -- prompt, detail, GTK_STOCK_CANCEL, NULL); -+ prompt, detail, _("_Cancel"), NULL); - goto out; - } - -- dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL, -+ dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), _("_Cancel"), - parent_window); - - gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL); -@@ -723,7 +723,7 @@ get_executable_text_file_action (GtkWind - _("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL, - _("_Display"), RESPONSE_DISPLAY, - parent_window); -- gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -+ gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN); - gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL); - gtk_widget_show (GTK_WIDGET (dialog)); -@@ -1056,7 +1056,7 @@ confirm_multiple_windows (GtkWindow *par - "This will open %d separate windows.", count), count); - } - dialog = eel_show_yes_no_dialog (prompt, detail, -- GTK_STOCK_OK, GTK_STOCK_CANCEL, -+ _("_OK"), _("_Cancel"), - parent_window); - g_free (detail); - -@@ -1153,9 +1153,9 @@ run_open_with_dialog (ActivateParameters - dialog = gtk_dialog_new_with_buttons (_("Open with"), - params->parent_window, - GTK_DIALOG_DESTROY_WITH_PARENT, -- GTK_STOCK_CANCEL, -+ _("_Cancel"), - GTK_RESPONSE_CANCEL, -- GTK_STOCK_OK, -+ _("_OK"), - GTK_RESPONSE_OK, - NULL); - -@@ -1245,7 +1245,7 @@ application_unhandled_uri (ActivateParam - } - - gtk_dialog_add_button (GTK_DIALOG (dialog), -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -+ _("_Cancel"), GTK_RESPONSE_CANCEL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - - g_signal_connect (dialog, "response", -@@ -1341,7 +1341,7 @@ activate_desktop_file (ActivateParameter - } - - gtk_dialog_add_button (GTK_DIALOG (dialog), -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -+ _("_Cancel"), GTK_RESPONSE_CANCEL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - - g_signal_connect (dialog, "response", -@@ -1566,7 +1566,7 @@ activate_files (ActivateParameters *para - detail = g_strdup_printf (ngettext ("This will open %d separate application.", - "This will open %d separate applications.", num_apps), num_apps); - dialog = eel_show_yes_no_dialog (prompt, detail, -- GTK_STOCK_OK, GTK_STOCK_CANCEL, -+ _("_OK"), _("_Cancel"), - parameters->parent_window); - g_free (detail); - -Index: nemo-2.0.3/src/nemo-places-sidebar.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-places-sidebar.c -+++ nemo-2.0.3/src/nemo-places-sidebar.c -@@ -295,7 +295,7 @@ get_eject_icon (NemoPlacesSidebar *sideb - GtkIconSet *icon_set; - - gtk_style_context_set_state (style, GTK_STATE_FLAG_NORMAL); -- icon_set = gtk_style_context_lookup_icon_set (style, GTK_STOCK_MISSING_IMAGE); -+ icon_set = gtk_style_context_lookup_icon_set (style, "image-missing"); - eject = gtk_icon_set_render_icon_pixbuf (icon_set, style, GTK_ICON_SIZE_MENU); - } - -@@ -3110,7 +3110,7 @@ bookmarks_build_popup_menu (NemoPlacesSi - - item = gtk_image_menu_item_new_with_mnemonic (_("_Open")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), -- gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU)); -+ gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU)); - g_signal_connect (item, "activate", - G_CALLBACK (open_shortcut_cb), sidebar); - gtk_widget_show (item); -@@ -3146,7 +3146,7 @@ bookmarks_build_popup_menu (NemoPlacesSi - item = gtk_image_menu_item_new_with_label (_("Remove")); - sidebar->popup_menu_remove_item = item; - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), -- gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU)); -+ gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU)); - g_signal_connect (item, "activate", - G_CALLBACK (remove_shortcut_cb), sidebar); - gtk_widget_show (item); -Index: nemo-2.0.3/src/nemo-properties-window.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-properties-window.c -+++ nemo-2.0.3/src/nemo-properties-window.c -@@ -4886,8 +4886,8 @@ create_properties_window (StartupData *s - append_extension_pages (window); - - gtk_dialog_add_buttons (GTK_DIALOG (window), -- GTK_STOCK_HELP, GTK_RESPONSE_HELP, -- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, -+ _("_Help"), GTK_RESPONSE_HELP, -+ _("_Close"), GTK_RESPONSE_CLOSE, - NULL); - - /* FIXME - HIGificiation, should be done inside GTK+ */ -@@ -5392,9 +5392,9 @@ select_image_button_callback (GtkWidget - if (dialog == NULL) { - dialog = gtk_file_chooser_dialog_new (_("Select Custom Icon"), GTK_WINDOW (window), - GTK_FILE_CHOOSER_ACTION_OPEN, -- GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_NO, -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -- GTK_STOCK_OPEN, GTK_RESPONSE_OK, -+ _("_Revert"), GTK_RESPONSE_NO, -+ _("_Cancel"), GTK_RESPONSE_CANCEL, -+ _("_Open"), GTK_RESPONSE_OK, - NULL); - gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL); - gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/icons", NULL); -Index: nemo-2.0.3/src/nemo-query-editor.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-query-editor.c -+++ nemo-2.0.3/src/nemo-query-editor.c -@@ -561,7 +561,7 @@ type_combo_changed (GtkComboBox *combo_b - dialog = gtk_dialog_new_with_buttons (_("Select type"), - GTK_WINDOW (toplevel), - 0, -- GTK_STOCK_OK, GTK_RESPONSE_OK, -+ _("_OK"), GTK_RESPONSE_OK, - NULL); - gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600); - -@@ -928,7 +928,7 @@ nemo_query_editor_add_row (NemoQueryEdit - create_type_widgets (row); - - button = gtk_button_new (); -- image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, -+ image = gtk_image_new_from_icon_name ("list-remove", - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_container_add (GTK_CONTAINER (button), image); - gtk_widget_show (image); -Index: nemo-2.0.3/src/nemo-tree-sidebar.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-tree-sidebar.c -+++ nemo-2.0.3/src/nemo-tree-sidebar.c -@@ -1248,7 +1248,7 @@ create_popup_menu (FMTreeView *view) - - - /* add the "open" menu item */ -- menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN, -+ menu_image = gtk_image_new_from_icon_name ("document-open", - GTK_ICON_SIZE_MENU); - gtk_widget_show (menu_image); - menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open")); -@@ -1303,7 +1303,7 @@ create_popup_menu (FMTreeView *view) - eel_gtk_menu_append_separator (GTK_MENU (popup)); - - /* add the "cut folder" menu item */ -- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL); -+ menu_item = gtk_image_menu_item_new_with_mnemonic (_("Cu_t")); - g_signal_connect (menu_item, "activate", - G_CALLBACK (fm_tree_view_cut_cb), - view); -@@ -1312,7 +1312,7 @@ create_popup_menu (FMTreeView *view) - view->details->popup_cut = menu_item; - - /* add the "copy folder" menu item */ -- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); -+ menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Copy")); - g_signal_connect (menu_item, "activate", - G_CALLBACK (fm_tree_view_copy_cb), - view); -@@ -1321,12 +1321,7 @@ create_popup_menu (FMTreeView *view) - view->details->popup_copy = menu_item; - - /* add the "paste files into folder" menu item */ -- menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE, -- GTK_ICON_SIZE_MENU); -- gtk_widget_show (menu_image); - menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), -- menu_image); - g_signal_connect (menu_item, "activate", - G_CALLBACK (fm_tree_view_paste_cb), - view); -@@ -1394,7 +1389,7 @@ create_popup_menu (FMTreeView *view) - GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (popup))); - - /* add the "properties" menu item */ -- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL); -+ menu_item = gtk_menu_item_new_with_mnemonic (_("_Properties")); - g_signal_connect (menu_item, "activate", - G_CALLBACK (fm_tree_view_properties_cb), - view); -Index: nemo-2.0.3/src/nemo-view.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-view.c -+++ nemo-2.0.3/src/nemo-view.c -@@ -1036,7 +1036,7 @@ nemo_view_confirm_multiple (GtkWindow *p - "This will open %'d separate windows.", count), count); - } - dialog = eel_show_yes_no_dialog (prompt, detail, -- GTK_STOCK_OK, GTK_STOCK_CANCEL, -+ _("_OK"), _("_Cancel"), - parent_window); - g_free (detail); - -@@ -1294,9 +1294,9 @@ choose_program (NemoView *view, - dialog = gtk_dialog_new_with_buttons (_("Open with"), - nemo_view_get_containing_window (view), - GTK_DIALOG_DESTROY_WITH_PARENT, -- GTK_STOCK_CANCEL, -+ _("_Cancel"), - GTK_RESPONSE_CANCEL, -- GTK_STOCK_OK, -+ _("_OK"), - GTK_RESPONSE_OK, - NULL); - -@@ -1567,11 +1567,11 @@ select_pattern (NemoView *view) - dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"), - nemo_view_get_containing_window (view), - GTK_DIALOG_DESTROY_WITH_PARENT, -- GTK_STOCK_HELP, -+ _("_Help"), - GTK_RESPONSE_HELP, -- GTK_STOCK_CANCEL, -+ _("_Cancel"), - GTK_RESPONSE_CANCEL, -- GTK_STOCK_OK, -+ _("_OK"), - GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), -@@ -1701,10 +1701,10 @@ action_save_search_as_callback (GtkActio - dialog = gtk_dialog_new_with_buttons (_("Save Search as"), - nemo_view_get_containing_window (directory_view), - 0, -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -+ _("_Cancel"), GTK_RESPONSE_CANCEL, - NULL); - save_button = gtk_dialog_add_button (GTK_DIALOG (dialog), -- GTK_STOCK_SAVE, GTK_RESPONSE_OK); -+ _("_Save"), GTK_RESPONSE_OK); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_OK); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); -@@ -6786,8 +6786,8 @@ action_browse_for_move_to_folder_callbac - dialog = gtk_file_chooser_dialog_new (_("Select Target Folder For Move"), - nemo_view_get_containing_window (view), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -- GTK_STOCK_OPEN, GTK_RESPONSE_OK, -+ _("_Cancel"), GTK_RESPONSE_CANCEL, -+ _("_Open"), GTK_RESPONSE_OK, - NULL); - - g_signal_connect (dialog, "response", -@@ -6807,8 +6807,8 @@ action_browse_for_copy_to_folder_callbac - dialog = gtk_file_chooser_dialog_new (_("Select Target Folder For Copy"), - nemo_view_get_containing_window (view), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -- GTK_STOCK_OPEN, GTK_RESPONSE_OK, -+ _("_Cancel"), GTK_RESPONSE_CANCEL, -+ _("_Open"), GTK_RESPONSE_OK, - NULL); - - g_signal_connect (dialog, "response", -@@ -7729,7 +7729,7 @@ action_connect_to_server_link_callback ( - dialog = gtk_dialog_new_with_buttons (title, - nemo_view_get_containing_window (view), - 0, -- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, -+ _("_Cancel"), GTK_RESPONSE_CANCEL, - _("_Connect"), GTK_RESPONSE_OK, - NULL); - -@@ -7955,7 +7955,7 @@ static const GtkActionEntry directory_vi - /* name, stock id, label */ { "New Documents", "document-new", N_("Create New _Document") }, - /* name, stock id, label */ { "Open With", NULL, N_("Open Wit_h"), - NULL, N_("Choose a program with which to open the selected item") }, -- /* name, stock id */ { "Properties", GTK_STOCK_PROPERTIES, -+ /* name, stock id */ { "Properties", "_Properties", - /* label, accelerator */ N_("_Properties"), "Return", - /* tooltip */ N_("View or modify the properties of each selected item"), - G_CALLBACK (action_properties_callback) }, -@@ -8018,21 +8018,21 @@ static const GtkActionEntry directory_vi - /* label, accelerator */ N_("E_mpty Trash"), NULL, - /* tooltip */ N_("Delete all items in the Trash"), - G_CALLBACK (action_empty_trash_callback) }, -- /* name, stock id */ { "Cut", GTK_STOCK_CUT, -+ /* name, stock id */ { "Cut", "Cu_t", - /* label, accelerator */ NULL, NULL, - /* tooltip */ N_("Prepare the selected files to be moved with a Paste command"), - G_CALLBACK (action_cut_files_callback) }, -- /* name, stock id */ { "Copy", GTK_STOCK_COPY, -+ /* name, stock id */ { "Copy", "_Copy", - /* label, accelerator */ NULL, NULL, - /* tooltip */ N_("Prepare the selected files to be copied with a Paste command"), - G_CALLBACK (action_copy_files_callback) }, -- /* name, stock id */ { "Paste", GTK_STOCK_PASTE, -+ /* name, stock id */ { "Paste", "_Paste", - /* label, accelerator */ NULL, NULL, - /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command"), - G_CALLBACK (action_paste_files_callback) }, - /* We make accelerator "" instead of null here to not inherit the stock - accelerator for paste */ -- /* name, stock id */ { "Paste Files Into", GTK_STOCK_PASTE, -+ /* name, stock id */ { "Paste Files Into", "_Paste", - /* label, accelerator */ N_("_Paste Into Folder"), "", - /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"), - G_CALLBACK (action_paste_files_into_callback) }, -@@ -8078,11 +8078,11 @@ static const GtkActionEntry directory_vi - /* label, accelerator */ N_("_Restore"), NULL, - NULL, - G_CALLBACK (action_restore_from_trash_callback) }, -- /* name, stock id */ { "Undo", GTK_STOCK_UNDO, -+ /* name, stock id */ { "Undo", "_Undo", - /* label, accelerator */ N_("_Undo"), "Z", - /* tooltip */ N_("Undo the last action"), - G_CALLBACK (action_undo_callback) }, -- /* name, stock id */ { "Redo", GTK_STOCK_REDO, -+ /* name, stock id */ { "Redo", "_Redo", - /* label, accelerator */ N_("_Redo"), "Y", - /* tooltip */ N_("Redo the last undone action"), - G_CALLBACK (action_redo_callback) }, -@@ -8171,15 +8171,15 @@ static const GtkActionEntry directory_vi - /* tooltip */ N_("Open this folder in a new tab"), - G_CALLBACK (action_location_open_in_new_tab_callback) }, - -- /* name, stock id */ { NEMO_ACTION_LOCATION_CUT, GTK_STOCK_CUT, -+ /* name, stock id */ { NEMO_ACTION_LOCATION_CUT, "Cu_t", - /* label, accelerator */ NULL, "", - /* tooltip */ N_("Prepare this folder to be moved with a Paste command"), - G_CALLBACK (action_location_cut_callback) }, -- /* name, stock id */ { NEMO_ACTION_LOCATION_COPY, GTK_STOCK_COPY, -+ /* name, stock id */ { NEMO_ACTION_LOCATION_COPY, "_Copy", - /* label, accelerator */ NULL, "", - /* tooltip */ N_("Prepare this folder to be copied with a Paste command"), - G_CALLBACK (action_location_copy_callback) }, -- /* name, stock id */ { NEMO_ACTION_LOCATION_PASTE_FILES_INTO, GTK_STOCK_PASTE, -+ /* name, stock id */ { NEMO_ACTION_LOCATION_PASTE_FILES_INTO, "_Paste", - /* label, accelerator */ N_("_Paste Into Folder"), "", - /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into this folder"), - G_CALLBACK (action_location_paste_files_into_callback) }, -@@ -8221,7 +8221,7 @@ static const GtkActionEntry directory_vi - /* tooltip */ N_("Detect media in the selected drive"), - G_CALLBACK (action_location_detect_media_callback) }, - -- /* name, stock id */ { "LocationProperties", GTK_STOCK_PROPERTIES, -+ /* name, stock id */ { "LocationProperties", "_Properties", - /* label, accelerator */ N_("_Properties"), NULL, - /* tooltip */ N_("View or modify the properties of this folder"), - G_CALLBACK (action_location_properties_callback) }, -@@ -9443,7 +9443,7 @@ real_update_menus (NemoView *view) - GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL); - - if (app_icon == NULL) { -- app_icon = g_themed_icon_new (GTK_STOCK_OPEN); -+ app_icon = g_themed_icon_new ("document-open"); - } - - gtk_action_set_gicon (action, app_icon); -Index: nemo-2.0.3/src/nemo-window-manage-views.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-window-manage-views.c -+++ nemo-2.0.3/src/nemo-window-manage-views.c -@@ -1149,7 +1149,7 @@ real_setup_loading_floating_bar (NemoWin - nemo_floating_bar_set_show_spinner (NEMO_FLOATING_BAR (slot->floating_bar), - TRUE); - nemo_floating_bar_add_action (NEMO_FLOATING_BAR (slot->floating_bar), -- GTK_STOCK_STOP, -+ _("_Stop"), - NEMO_FLOATING_BAR_ACTION_ID_STOP); - - gtk_widget_set_halign (slot->floating_bar, GTK_ALIGN_END); -Index: nemo-2.0.3/src/nemo-window-menus.c -=================================================================== ---- nemo-2.0.3.orig/src/nemo-window-menus.c -+++ nemo-2.0.3/src/nemo-window-menus.c -@@ -1036,11 +1036,11 @@ static const GtkActionEntry main_entries - /* name, stock id, label */ { "Edit", NULL, N_("_Edit") }, - /* name, stock id, label */ { "View", NULL, N_("_View") }, - /* name, stock id, label */ { "Help", NULL, N_("_Help") }, -- /* name, stock id */ { "Close", GTK_STOCK_CLOSE, -+ /* name, stock id */ { "Close", "_Close", - /* label, accelerator */ N_("_Close"), "W", - /* tooltip */ N_("Close this folder"), - G_CALLBACK (action_close_window_slot_callback) }, -- { "Preferences", GTK_STOCK_PREFERENCES, -+ { "Preferences", "_Preferences", - N_("Prefere_nces"), - NULL, N_("Edit Nemo preferences"), - G_CALLBACK (action_preferences_callback) }, diff --git a/nemo-2.0.4.tar.gz b/nemo-2.0.4.tar.gz deleted file mode 100644 index 4d387ea..0000000 --- a/nemo-2.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d808b0cd5ffb7c4f4868257111facf56e3c12654a0a1d35dd386dc37247603f -size 1339382 diff --git a/nemo-2.0.5.tar.gz b/nemo-2.0.5.tar.gz new file mode 100644 index 0000000..96834e6 --- /dev/null +++ b/nemo-2.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65badc377cef7a445b8d0f0debe562c8fcb9d17b7deb6f6e7f64dfd869983712 +size 1339431 diff --git a/nemo.changes b/nemo.changes index ed538d8..7fe53a1 100644 --- a/nemo.changes +++ b/nemo.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 4 11:25:33 UTC 2013 - johann.luce@wanadoo.fr + +- update version 2.0.5 + * When renaming test.folder in listview, select entire filename. + * remove nemo-2.0.3-GTK_STOCK.patch + * clean spec file + ------------------------------------------------------------------- Sat Nov 2 05:03:08 UTC 2013 - i@marguerite.su diff --git a/nemo.spec b/nemo.spec index bfacc2e..10c6d8c 100644 --- a/nemo.spec +++ b/nemo.spec @@ -18,7 +18,7 @@ Name: nemo -Version: 2.0.4 +Version: 2.0.5 Release: 0 License: GPL-2.0+ and LGPL-2.0 Summary: File browser for Cinnamon @@ -27,8 +27,6 @@ Group: System/GUI/Other Source: %{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM marguerite@opensuse.org fix OBS gcc checks Patch1: nemo-2.0.1-view-no-return.patch -# PATCH-FIX-UPSTREAM marguerite@opensuse.org GTK_STOCK_* is deprecated -Patch2: nemo-2.0.3-GTK_STOCK.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc @@ -92,7 +90,6 @@ This package provides the GObject Introspection bindings for Nemo. %setup -q %patch1 -p1 %if 0%{?suse_version} > 1230 -#%patch2 -p1 %endif %build