diff options
Diffstat (limited to 'meta/packages/pcmanfm/files/owl-window-menu.patch')
-rw-r--r-- | meta/packages/pcmanfm/files/owl-window-menu.patch | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/meta/packages/pcmanfm/files/owl-window-menu.patch b/meta/packages/pcmanfm/files/owl-window-menu.patch index 7db68f4b12..d11140cf42 100644 --- a/meta/packages/pcmanfm/files/owl-window-menu.patch +++ b/meta/packages/pcmanfm/files/owl-window-menu.patch | |||
@@ -1,26 +1,26 @@ | |||
1 | Index: pcmanfm-0.3.2-beta/configure.in | 1 | Index: pcmanfm-0.5/configure.in |
2 | =================================================================== | 2 | =================================================================== |
3 | --- pcmanfm-0.3.2-beta.orig/configure.in 2007-04-26 09:09:33.000000000 +0100 | 3 | --- pcmanfm-0.5.orig/configure.in |
4 | +++ pcmanfm-0.3.2-beta/configure.in 2007-04-26 09:12:41.000000000 +0100 | 4 | +++ pcmanfm-0.5/configure.in |
5 | @@ -15,6 +15,12 @@ | 5 | @@ -25,6 +25,12 @@ |
6 | libstartup-notification-1.0" | 6 | gtk_modules="gtk+-2.0 >= 2.6.0 \ |
7 | 7 | gthread-2.0" | |
8 | PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) | 8 | PKG_CHECK_MODULES(GTK, [$gtk_modules]) |
9 | + | 9 | + |
10 | +OWL_CFLAGS="" | 10 | +OWL_CFLAGS="" |
11 | +OWL_LIBS="-lowl" | 11 | +OWL_LIBS="-lowl" |
12 | +PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OWL_CFLAGS" | 12 | +GTK_CFLAGS="$GTK_CFLAGS $OWL_CFLAGS" |
13 | +PACKAGE_LIBS="$PACKAGE_LIBS $OWL_LIBS" | 13 | +GTK_LIBS="$GTK_LIBS $OWL_LIBS" |
14 | + | 14 | + |
15 | AC_SUBST(PACKAGE_CFLAGS) | 15 | AC_SUBST(GTK_CFLAGS) |
16 | AC_SUBST(PACKAGE_LIBS) | 16 | AC_SUBST(GTK_LIBS) |
17 | 17 | ||
18 | Index: pcmanfm-0.3.2-beta/src/main-window.c | 18 | Index: pcmanfm-0.5/src/main-window.c |
19 | =================================================================== | 19 | =================================================================== |
20 | --- pcmanfm-0.3.2-beta.orig/src/main-window.c 2007-04-26 09:09:15.000000000 +0100 | 20 | --- pcmanfm-0.5.orig/src/main-window.c |
21 | +++ pcmanfm-0.3.2-beta/src/main-window.c 2007-04-26 09:10:51.000000000 +0100 | 21 | +++ pcmanfm-0.5/src/main-window.c |
22 | @@ -414,9 +414,7 @@ | 22 | @@ -534,9 +534,7 @@ |
23 | main_window->splitter_pos = appSettings.splitterPos; | 23 | main_window->splitter_pos = app_settings.splitter_pos; |
24 | 24 | ||
25 | /* Create menu bar */ | 25 | /* Create menu bar */ |
26 | - main_window->menu_bar = gtk_menu_bar_new (); | 26 | - main_window->menu_bar = gtk_menu_bar_new (); |
@@ -29,23 +29,23 @@ Index: pcmanfm-0.3.2-beta/src/main-window.c | |||
29 | + main_window->menu_bar = gtk_menu_new (); | 29 | + main_window->menu_bar = gtk_menu_new (); |
30 | 30 | ||
31 | main_window->accel_group = gtk_accel_group_new (); | 31 | main_window->accel_group = gtk_accel_group_new (); |
32 | fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) & main_window->open_side_pane_menu; | 32 | fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) (GtkWidget*) & main_window->open_side_pane_menu; |
33 | Index: pcmanfm-0.3.2-beta/src/main.c | 33 | Index: pcmanfm-0.5/src/main.c |
34 | =================================================================== | 34 | =================================================================== |
35 | --- pcmanfm-0.3.2-beta.orig/src/main.c 2007-04-26 09:09:15.000000000 +0100 | 35 | --- pcmanfm-0.5.orig/src/main.c |
36 | +++ pcmanfm-0.3.2-beta/src/main.c 2007-04-26 09:21:40.000000000 +0100 | 36 | +++ pcmanfm-0.5/src/main.c |
37 | @@ -32,6 +32,8 @@ | 37 | @@ -48,6 +48,8 @@ |
38 | #include "glade-support.h" | 38 | |
39 | #include "settings.h" | 39 | #include "desktop.h" |
40 | 40 | ||
41 | +#include "libowl/owlwindowmenu.h" | 41 | +#include "libowl/owlwindowmenu.h" |
42 | + | 42 | + |
43 | static char* init_path = NULL; | 43 | typedef enum{ |
44 | 44 | CMD_OPEN = 1, | |
45 | static int sock; | 45 | CMD_OPEN_TAB, |
46 | @@ -171,6 +173,10 @@ | 46 | @@ -320,6 +322,10 @@ |
47 | gtk_window_set_default_size( GTK_WINDOW( main_window ), | 47 | gtk_window_maximize( GTK_WINDOW( main_window ) ); |
48 | appSettings.width, appSettings.height ); | 48 | } |
49 | gtk_widget_show ( GTK_WIDGET( main_window ) ); | 49 | gtk_widget_show ( GTK_WIDGET( main_window ) ); |
50 | + gtk_widget_show_all (main_window->menu_bar); | 50 | + gtk_widget_show_all (main_window->menu_bar); |
51 | + owl_set_window_menu (GTK_WINDOW(main_window), | 51 | + owl_set_window_menu (GTK_WINDOW(main_window), |