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=39

Browse Source
This commit is contained in:
Marguerite Su 2013-10-27 12:47:47 +00:00 committed by Git OBS Bridge
parent 4856ad8658
commit 9f0c0edfc4
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
nemo-2.0.1-GTK_STOCK.patch
View File

@ -2,6 +2,20 @@ Index: nemo-2.0.1/eel/eel-editable-label.c
=================================================================== ===================================================================
--- nemo-2.0.1.orig/eel/eel-editable-label.c --- nemo-2.0.1.orig/eel/eel-editable-label.c
+++ nemo-2.0.1/eel/eel-editable-label.c +++ nemo-2.0.1/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 *icon_name,
const gchar *signal,
gboolean sensitive)
{
- GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
+ GtkWidget *menuitem = gtk_image_menu_item_new_from_icon_name (icon_name, NULL);
g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
g_signal_connect (menuitem, "activate",
@@ -3094,11 +3094,11 @@ popup_targets_received (GtkClipboard @@ -3094,11 +3094,11 @@ popup_targets_received (GtkClipboard
clipboard_contains_text = gtk_selection_data_targets_include_text (data); clipboard_contains_text = gtk_selection_data_targets_include_text (data);
@ -108,7 +122,15 @@ Index: nemo-2.0.1/libnemo-private/nemo-action.h
=================================================================== ===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-action.h --- nemo-2.0.1.orig/libnemo-private/nemo-action.h
+++ nemo-2.0.1/libnemo-private/nemo-action.h +++ nemo-2.0.1/libnemo-private/nemo-action.h
@@ -81,7 +81,7 @@ typedef enum { @@ -21,6 +21,7 @@
#define NEMO_ACTION_H
#include <gtk/gtk.h>
+#include <gio/gio.h>
#include <glib.h>
#include "nemo-file.h"
@@ -81,7 +82,7 @@ typedef enum {
} TokenType; } TokenType;
struct _NemoAction { struct _NemoAction {
@ -117,7 +139,7 @@ Index: nemo-2.0.1/libnemo-private/nemo-action.h
gchar *key_file_path; gchar *key_file_path;
SelectionType selection_type; SelectionType selection_type;
gchar **extensions; gchar **extensions;
@@ -101,7 +101,7 @@ struct _NemoAction { @@ -101,7 +102,7 @@ struct _NemoAction {
}; };
struct _NemoActionClass { struct _NemoActionClass {
@ -628,38 +650,34 @@ Index: nemo-2.0.1/src/nemo-tree-sidebar.c
GTK_ICON_SIZE_MENU); GTK_ICON_SIZE_MENU);
gtk_widget_show (menu_image); gtk_widget_show (menu_image);
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open")); menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
@@ -1303,8 +1303,7 @@ create_popup_menu (FMTreeView *view) @@ -1303,7 +1303,7 @@ create_popup_menu (FMTreeView *view)
eel_gtk_menu_append_separator (GTK_MENU (popup)); eel_gtk_menu_append_separator (GTK_MENU (popup));
/* add the "cut folder" menu item */ /* 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_from_stock (GTK_STOCK_CUT, NULL);
- g_signal_connect (menu_item, "activate", + menu_item = gtk_image_menu_item_new_with_mnemonic (_("Cu_t"));
+ g_signal_connect (_("Cu_t"), "activate", g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_cut_cb), G_CALLBACK (fm_tree_view_cut_cb),
view); view);
gtk_widget_show (menu_item); @@ -1312,7 +1312,7 @@ create_popup_menu (FMTreeView *view)
@@ -1312,8 +1311,7 @@ create_popup_menu (FMTreeView *view)
view->details->popup_cut = menu_item; view->details->popup_cut = menu_item;
/* add the "copy folder" 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_from_stock (GTK_STOCK_COPY, NULL);
- g_signal_connect (menu_item, "activate", + menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Copy"));
+ g_signal_connect (_("_Copy"), "activate", g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_copy_cb), G_CALLBACK (fm_tree_view_copy_cb),
view); view);
gtk_widget_show (menu_item); @@ -1321,12 +1321,7 @@ create_popup_menu (FMTreeView *view)
@@ -1321,13 +1319,7 @@ create_popup_menu (FMTreeView *view)
view->details->popup_copy = menu_item; view->details->popup_copy = menu_item;
/* add the "paste files into folder" menu item */ /* add the "paste files into folder" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE, - menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
- GTK_ICON_SIZE_MENU); - GTK_ICON_SIZE_MENU);
- gtk_widget_show (menu_image); - gtk_widget_show (menu_image);
- menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder")); menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
- menu_image); - menu_image);
- g_signal_connect (menu_item, "activate", g_signal_connect (menu_item, "activate",
+ g_signal_connect (_("_Paste Into Folder"), "activate",
G_CALLBACK (fm_tree_view_paste_cb), G_CALLBACK (fm_tree_view_paste_cb),
view); view);
gtk_widget_show (menu_item);