owl window menu

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1564 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 61 insertions, 2 deletions

diff --git a/meta/packages/pcmanfm/files/owl-window-menu.patch b/meta/packages/pcmanfm/files/owl-window-menu.patch
new file mode 100644
index 0000000000..31eba8683b
--- /dev/null
+++ b/meta/packages/pcmanfm/files/owl-window-menu.patch
@@ -0,0 +1,56 @@
+Index: pcmanfm-0.3.2-beta/configure.in
+===================================================================
+--- pcmanfm-0.3.2-beta.orig/configure.in        2007-04-26 09:09:33.000000000 +0100
++++ pcmanfm-0.3.2-beta/configure.in     2007-04-26 09:12:41.000000000 +0100
+@@ -15,6 +15,12 @@
+              libstartup-notification-1.0"
+ 
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
++
++OWL_CFLAGS=""
++OWL_LIBS="-lowl"
++PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OWL_CFLAGS"
++PACKAGE_LIBS="$PACKAGE_LIBS $OWL_LIBS"
++
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
+Index: pcmanfm-0.3.2-beta/src/main-window.c
+===================================================================
+--- pcmanfm-0.3.2-beta.orig/src/main-window.c   2007-04-26 09:09:15.000000000 +0100
++++ pcmanfm-0.3.2-beta/src/main-window.c        2007-04-26 09:10:51.000000000 +0100
+@@ -414,9 +414,7 @@
+     main_window->splitter_pos = appSettings.splitterPos;
+ 
+     /* Create menu bar */
+-    main_window->menu_bar = gtk_menu_bar_new ();
+-    gtk_box_pack_start ( GTK_BOX ( main_window->main_vbox ),
+-                         main_window->menu_bar, FALSE, FALSE, 0 );
++    main_window->menu_bar = gtk_menu_new ();
+ 
+     main_window->accel_group = gtk_accel_group_new ();
+     fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) & main_window->open_side_pane_menu;
+Index: pcmanfm-0.3.2-beta/src/main.c
+===================================================================
+--- pcmanfm-0.3.2-beta.orig/src/main.c  2007-04-26 09:09:15.000000000 +0100
++++ pcmanfm-0.3.2-beta/src/main.c       2007-04-26 09:21:40.000000000 +0100
+@@ -32,6 +32,8 @@
+ #include "glade-support.h"
+ #include "settings.h"
+ 
++#include "owlwindowmenu.h"
++
+ static char* init_path = NULL;
+ 
+ static int sock;
+@@ -171,6 +173,10 @@
+     gtk_window_set_default_size( GTK_WINDOW( main_window ),
+                                  appSettings.width, appSettings.height );
+     gtk_widget_show ( GTK_WIDGET( main_window ) );
++    gtk_widget_show_all (main_window->menu_bar);
++    owl_set_window_menu (GTK_WINDOW(main_window),
++                        GTK_MENU(main_window->menu_bar));
++
+     return main_window;
+ }
+ #if 0
diff --git a/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb
index ebbcb32f8a..def5370e19 100644
--- a/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb
+++ b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb
@@ -2,7 +2,9 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "x11"
 PRIORITY = "optional"
-DEPENDS = "gtk+"
+DEPENDS = "gtk+ libowl"
+
+PR="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
            file://gnome-fs-directory.png \
@@ -10,7 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
            file://gnome-mime-text-plain.png \
            file://emblem-symbolic-link.png \
            file://desktop.patch;patch=1 \
-           file://no-warnings.patch;patch=1"
+           file://no-warnings.patch;patch=1 \
+           file://owl-window-menu.patch;patch=1"
 
 EXTRA_OECONF = "--enable-inotify --disable-hal"