diff options
Diffstat (limited to 'meta/recipes-sato/pcmanfm/files/owl-window-menu.patch')
-rw-r--r-- | meta/recipes-sato/pcmanfm/files/owl-window-menu.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch deleted file mode 100644 index 88b154e5cb..0000000000 --- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | 0.9.7 use a new menu bar from gtk_ui_manager, so need a translation here to | ||
2 | enable owl menu | ||
3 | |||
4 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
5 | |||
6 | Upstream-Status: Inappropriate [enable feature] | ||
7 | |||
8 | Index: pcmanfm-0.9.9/configure.ac | ||
9 | =================================================================== | ||
10 | --- pcmanfm-0.9.9.orig/configure.ac 2011-08-10 05:28:31.000000000 +0800 | ||
11 | +++ pcmanfm-0.9.9/configure.ac 2011-10-10 15:47:33.000000000 +0800 | ||
12 | @@ -70,6 +70,8 @@ | ||
13 | |||
14 | gtk_modules="gtk+-2.0 >= 2.16.0" | ||
15 | PKG_CHECK_MODULES(GTK, [$gtk_modules]) | ||
16 | +OWL_LIBS="-lowl" | ||
17 | +GTK_LIBS="$GTK_LIBS $OWL_LIBS" | ||
18 | AC_SUBST(GTK_CFLAGS) | ||
19 | AC_SUBST(GTK_LIBS) | ||
20 | |||
21 | Index: pcmanfm-0.9.9/src/main-win.c | ||
22 | =================================================================== | ||
23 | --- pcmanfm-0.9.9.orig/src/main-win.c 2011-08-10 05:28:32.000000000 +0800 | ||
24 | +++ pcmanfm-0.9.9/src/main-win.c 2011-10-10 15:50:48.000000000 +0800 | ||
25 | @@ -37,6 +37,8 @@ | ||
26 | #include "pref.h" | ||
27 | #include "tab-page.h" | ||
28 | |||
29 | +#include "libowl/owlwindowmenu.h" | ||
30 | + | ||
31 | static void fm_main_win_finalize (GObject *object); | ||
32 | G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW); | ||
33 | |||
34 | @@ -400,9 +402,27 @@ | ||
35 | } | ||
36 | } | ||
37 | |||
38 | +/* Transfer gtk_ui_manager menubar to gtk menubar */ | ||
39 | +static GtkWidget * ui_menubar_to_menu(GtkWidget *menubar) | ||
40 | +{ | ||
41 | + GtkWidget *main_menu; | ||
42 | + GList *iter; | ||
43 | + | ||
44 | + main_menu = gtk_menu_new(); | ||
45 | + | ||
46 | + for ( iter = gtk_container_get_children(GTK_CONTAINER(menubar)); | ||
47 | + iter; | ||
48 | + iter = g_list_next(iter) ) | ||
49 | + { | ||
50 | + GtkWidget *menu = GTK_WIDGET(iter->data); | ||
51 | + gtk_widget_reparent(menu, main_menu); | ||
52 | + } | ||
53 | + return main_menu; | ||
54 | +} | ||
55 | + | ||
56 | static void fm_main_win_init(FmMainWin *win) | ||
57 | { | ||
58 | - GtkWidget *vbox, *menubar, *toolitem, *btn; | ||
59 | + GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn; | ||
60 | GtkUIManager* ui; | ||
61 | GtkActionGroup* act_grp; | ||
62 | GtkAction* act; | ||
63 | @@ -456,7 +476,6 @@ | ||
64 | win->popup = gtk_ui_manager_get_widget(ui, "/popup"); | ||
65 | gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL); | ||
66 | |||
67 | - gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 ); | ||
68 | gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 ); | ||
69 | |||
70 | /* load bookmarks menu */ | ||
71 | @@ -517,6 +536,10 @@ | ||
72 | |||
73 | gtk_container_add( (GtkContainer*)win, vbox ); | ||
74 | gtk_widget_show_all(vbox); | ||
75 | + | ||
76 | + owl_menubar = ui_menubar_to_menu(menubar); | ||
77 | + gtk_widget_show_all(owl_menubar); | ||
78 | + owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar)); | ||
79 | } | ||
80 | |||
81 | |||