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

nemo-2.0.3-GTK_STOCK.patch

@@ -1,7 +1,7 @@
-Index: nemo-2.0.1/eel/eel-editable-label.c
+Index: nemo-2.0.3/eel/eel-editable-label.c
 ===================================================================
---- nemo-2.0.1.orig/eel/eel-editable-label.c
+--- nemo-2.0.3.orig/eel/eel-editable-label.c
-+++ nemo-2.0.1/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,
@@ -31,10 +31,10 @@ Index: nemo-2.0.1/eel/eel-editable-label.c
  			    clipboard_contains_text);
    
        menuitem = gtk_menu_item_new_with_label (_("Select All"));
-Index: nemo-2.0.1/eel/eel-stock-dialogs.c
+Index: nemo-2.0.3/eel/eel-stock-dialogs.c
 ===================================================================
---- nemo-2.0.1.orig/eel/eel-stock-dialogs.c
+--- nemo-2.0.3.orig/eel/eel-stock-dialogs.c
-+++ nemo-2.0.1/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;
  
@@ -44,10 +44,52 @@ Index: nemo-2.0.1/eel/eel-stock-dialogs.c
  	dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
  						     0,
  						     GTK_MESSAGE_INFO,
-Index: nemo-2.0.1/libnemo-private/nemo-clipboard.c
+Index: nemo-2.0.3/libnemo-private/nemo-action.c
 ===================================================================
---- nemo-2.0.1.orig/libnemo-private/nemo-clipboard.c
+--- nemo-2.0.3.orig/libnemo-private/nemo-action.c
-+++ nemo-2.0.1/libnemo-private/nemo-clipboard.c
++++ nemo-2.0.3/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.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
  }
  
@@ -67,83 +109,10 @@ Index: nemo-2.0.1/libnemo-private/nemo-clipboard.c
    /* 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
+Index: nemo-2.0.3/libnemo-private/nemo-column-chooser.c
 ===================================================================
---- nemo-2.0.1.orig/libnemo-private/nemo-file-conflict-dialog.c
+--- nemo-2.0.3.orig/libnemo-private/nemo-column-chooser.c
-+++ nemo-2.0.1/libnemo-private/nemo-file-conflict-dialog.c
++++ nemo-2.0.3/libnemo-private/nemo-column-chooser.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.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-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);
-@@ -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.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
  }
  
@@ -178,10 +147,63 @@ Index: nemo-2.0.1/libnemo-private/nemo-column-chooser.c
  								       _("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
+Index: nemo-2.0.3/libnemo-private/nemo-desktop-link-monitor.c
 ===================================================================
---- nemo-2.0.1.orig/libnemo-private/nemo-file-operations.c
+--- nemo-2.0.3.orig/libnemo-private/nemo-desktop-link-monitor.c
-+++ nemo-2.0.1/libnemo-private/nemo-file-operations.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,
@@ -488,191 +510,10 @@ Index: nemo-2.0.1/libnemo-private/nemo-file-operations.c
  							      NULL);
  				} else {
  					response = 0;
-Index: nemo-2.0.1/libnemo-private/nemo-desktop-link-monitor.c
+Index: nemo-2.0.3/src/nemo-connect-server-dialog.c
 ===================================================================
---- nemo-2.0.1.orig/libnemo-private/nemo-desktop-link-monitor.c
+--- nemo-2.0.3.orig/src/nemo-connect-server-dialog.c
-+++ nemo-2.0.1/libnemo-private/nemo-desktop-link-monitor.c
++++ nemo-2.0.3/src/nemo-connect-server-dialog.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.1/src/nemo-mime-actions.c
-===================================================================
---- nemo-2.0.1.orig/src/nemo-mime-actions.c
-+++ nemo-2.0.1/src/nemo-mime-actions.c
-@@ -672,11 +672,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);
-@@ -747,7 +747,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));
-@@ -1080,7 +1080,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);
- 
-@@ -1177,9 +1177,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);
- 
-@@ -1269,7 +1269,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",
-@@ -1365,7 +1365,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",
-@@ -1590,7 +1590,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.1/src/nemo-places-sidebar.c
-===================================================================
---- nemo-2.0.1.orig/src/nemo-places-sidebar.c
-+++ nemo-2.0.1/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.1/src/nemo-tree-sidebar.c
-===================================================================
---- nemo-2.0.1.orig/src/nemo-tree-sidebar.c
-+++ nemo-2.0.1/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.1/src/nemo-connect-server-dialog.c
-===================================================================
---- nemo-2.0.1.orig/src/nemo-connect-server-dialog.c
-+++ nemo-2.0.1/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);
@@ -725,10 +566,129 @@ Index: nemo-2.0.1/src/nemo-connect-server-dialog.c
  			       GTK_RESPONSE_CANCEL);
  	connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
  						_("C_onnect"),
-Index: nemo-2.0.1/src/nemo-properties-window.c
+Index: nemo-2.0.3/src/nemo-location-bar.c
 ===================================================================
---- nemo-2.0.1.orig/src/nemo-properties-window.c
+--- nemo-2.0.3.orig/src/nemo-location-bar.c
-+++ nemo-2.0.1/src/nemo-properties-window.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);
  
@@ -752,42 +712,86 @@ Index: nemo-2.0.1/src/nemo-properties-window.c
 +						      _("_Open"), GTK_RESPONSE_OK,
  						      NULL);
  		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL);
- 		gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+         gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/icons", NULL);
-Index: nemo-2.0.1/src/nemo-window-manage-views.c
+Index: nemo-2.0.3/src/nemo-query-editor.c
 ===================================================================
---- nemo-2.0.1.orig/src/nemo-window-manage-views.c
+--- nemo-2.0.3.orig/src/nemo-query-editor.c
-+++ nemo-2.0.1/src/nemo-window-manage-views.c
++++ nemo-2.0.3/src/nemo-query-editor.c
-@@ -1149,7 +1149,7 @@ real_setup_loading_floating_bar (NemoWin
+@@ -561,7 +561,7 @@ type_combo_changed (GtkComboBox *combo_b
- 	nemo_floating_bar_set_show_spinner (NEMO_FLOATING_BAR (slot->floating_bar),
+ 		dialog = gtk_dialog_new_with_buttons (_("Select type"),
- 						TRUE);
+ 						      GTK_WINDOW (toplevel),
- 	nemo_floating_bar_add_action (NEMO_FLOATING_BAR (slot->floating_bar),
+ 						      0,
--					  GTK_STOCK_STOP,
+-						      GTK_STOCK_OK, GTK_RESPONSE_OK,
-+					  _("_Stop"),
++						      _("_OK"), GTK_RESPONSE_OK,
- 					  NEMO_FLOATING_BAR_ACTION_ID_STOP);
+ 						      NULL);
+ 		gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
  			
- 	gtk_widget_set_halign (slot->floating_bar, GTK_ALIGN_END);
+@@ -928,7 +928,7 @@ nemo_query_editor_add_row (NemoQueryEdit
-Index: nemo-2.0.1/src/nemo-window-menus.c
+ 	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.1.orig/src/nemo-window-menus.c
+--- nemo-2.0.3.orig/src/nemo-tree-sidebar.c
-+++ nemo-2.0.1/src/nemo-window-menus.c
++++ nemo-2.0.3/src/nemo-tree-sidebar.c
-@@ -1036,11 +1036,11 @@ static const GtkActionEntry main_entries
+@@ -1248,7 +1248,7 @@ create_popup_menu (FMTreeView *view)
-   /* name, stock id, label */  { "Edit", NULL, N_("_Edit") },
+ 	
-   /* name, stock id, label */  { "View", NULL, N_("_View") },
+ 	
-   /* name, stock id, label */  { "Help", NULL, N_("_Help") },
+ 	/* add the "open" menu item */
--  /* name, stock id */         { "Close", GTK_STOCK_CLOSE,
+-	menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
-+  /* name, stock id */         { "Close", "_Close",
++	menu_image = gtk_image_new_from_icon_name ("document-open",
-   /* label, accelerator */       N_("_Close"), "<control>W",
+ 					       GTK_ICON_SIZE_MENU);
-   /* tooltip */                  N_("Close this folder"),
+ 	gtk_widget_show (menu_image);
-                                  G_CALLBACK (action_close_window_slot_callback) },
+ 	menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
--                               { "Preferences", GTK_STOCK_PREFERENCES,
+@@ -1303,7 +1303,7 @@ create_popup_menu (FMTreeView *view)
-+                               { "Preferences", "_Preferences",
+ 	eel_gtk_menu_append_separator (GTK_MENU (popup));
-                                  N_("Prefere_nces"),               
+ 	
-                                  NULL, N_("Edit Nemo preferences"),
+ 	/* add the "cut folder" menu item */
-                                  G_CALLBACK (action_preferences_callback) },
+-	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL);
-Index: nemo-2.0.1/src/nemo-view.c
++	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.1.orig/src/nemo-view.c
+--- nemo-2.0.3.orig/src/nemo-view.c
-+++ nemo-2.0.1/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);
  	}
@@ -954,38 +958,34 @@ Index: nemo-2.0.1/src/nemo-view.c
  	}
  
  	gtk_action_set_gicon (action, app_icon);
-Index: nemo-2.0.1/src/nemo-location-bar.c
+Index: nemo-2.0.3/src/nemo-window-manage-views.c
 ===================================================================
---- nemo-2.0.1.orig/src/nemo-location-bar.c
+--- nemo-2.0.3.orig/src/nemo-window-manage-views.c
-+++ nemo-2.0.1/src/nemo-location-bar.c
++++ nemo-2.0.3/src/nemo-window-manage-views.c
-@@ -193,7 +193,7 @@ drag_data_received_callback (GtkWidget *
+@@ -1149,7 +1149,7 @@ real_setup_loading_floating_bar (NemoWin
- 			 GTK_MESSAGE_QUESTION,
+ 	nemo_floating_bar_set_show_spinner (NEMO_FLOATING_BAR (slot->floating_bar),
- 			 prompt,
+ 						TRUE);
- 			 detail,
+ 	nemo_floating_bar_add_action (NEMO_FLOATING_BAR (slot->floating_bar),
--			 GTK_STOCK_CANCEL, GTK_STOCK_OK,
+-					  GTK_STOCK_STOP,
-+			 _("_Cancel"), _("_OK"),
++					  _("_Stop"),
- 			 NULL) != 0 /* GNOME_OK */;
+ 					  NEMO_FLOATING_BAR_ACTION_ID_STOP);
  
- 		g_free (prompt);
+ 	gtk_widget_set_halign (slot->floating_bar, GTK_ALIGN_END);
-Index: nemo-2.0.1/src/nemo-query-editor.c
+Index: nemo-2.0.3/src/nemo-window-menus.c
 ===================================================================
---- nemo-2.0.1.orig/src/nemo-query-editor.c
+--- nemo-2.0.3.orig/src/nemo-window-menus.c
-+++ nemo-2.0.1/src/nemo-query-editor.c
++++ nemo-2.0.3/src/nemo-window-menus.c
-@@ -561,7 +561,7 @@ type_combo_changed (GtkComboBox *combo_b
+@@ -1036,11 +1036,11 @@ static const GtkActionEntry main_entries
- 		dialog = gtk_dialog_new_with_buttons (_("Select type"),
+   /* name, stock id, label */  { "Edit", NULL, N_("_Edit") },
- 						      GTK_WINDOW (toplevel),
+   /* name, stock id, label */  { "View", NULL, N_("_View") },
- 						      0,
+   /* name, stock id, label */  { "Help", NULL, N_("_Help") },
--						      GTK_STOCK_OK, GTK_RESPONSE_OK,
+-  /* name, stock id */         { "Close", GTK_STOCK_CLOSE,
-+						      _("_OK"), GTK_RESPONSE_OK,
++  /* name, stock id */         { "Close", "_Close",
- 						      NULL);
+   /* label, accelerator */       N_("_Close"), "<control>W",
- 		gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
+   /* tooltip */                  N_("Close this folder"),
- 			
+                                  G_CALLBACK (action_close_window_slot_callback) },
-@@ -928,7 +928,7 @@ nemo_query_editor_add_row (NemoQueryEdit
+-                               { "Preferences", GTK_STOCK_PREFERENCES,
- 	create_type_widgets (row);
++                               { "Preferences", "_Preferences",
- 	
+                                  N_("Prefere_nces"),               
- 	button = gtk_button_new ();
+                                  NULL, N_("Edit Nemo preferences"),
--	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE,
+                                  G_CALLBACK (action_preferences_callback) },
-+	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);

nemo.spec

@@ -28,7 +28,7 @@ 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.1-GTK_STOCK.patch
+Patch2:		nemo-2.0.3-GTK_STOCK.patch
 BuildRequires:	fdupes
 BuildRequires:  gnome-common
 BuildRequires:	gtk-doc