summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-04-26 08:20:01 +0000
committerTomas Frydrych <tf@openedhand.com>2007-04-26 08:20:01 +0000
commit8aa2c8440c848cfa53ae04caa8587340d3ba2021 (patch)
tree8a317397c4be6a1e64d461add3c465314e3e7124
parentb2b95669c140b8cbdf50006a33ef5cfc56117ff8 (diff)
downloadpoky-8aa2c8440c848cfa53ae04caa8587340d3ba2021.tar.gz
owl window menu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1564 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/pcmanfm/files/owl-window-menu.patch56
-rw-r--r--meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb7
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 @@
1Index: pcmanfm-0.3.2-beta/configure.in
2===================================================================
3--- pcmanfm-0.3.2-beta.orig/configure.in 2007-04-26 09:09:33.000000000 +0100
4+++ pcmanfm-0.3.2-beta/configure.in 2007-04-26 09:12:41.000000000 +0100
5@@ -15,6 +15,12 @@
6 libstartup-notification-1.0"
7
8 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
9+
10+OWL_CFLAGS=""
11+OWL_LIBS="-lowl"
12+PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OWL_CFLAGS"
13+PACKAGE_LIBS="$PACKAGE_LIBS $OWL_LIBS"
14+
15 AC_SUBST(PACKAGE_CFLAGS)
16 AC_SUBST(PACKAGE_LIBS)
17
18Index: pcmanfm-0.3.2-beta/src/main-window.c
19===================================================================
20--- pcmanfm-0.3.2-beta.orig/src/main-window.c 2007-04-26 09:09:15.000000000 +0100
21+++ pcmanfm-0.3.2-beta/src/main-window.c 2007-04-26 09:10:51.000000000 +0100
22@@ -414,9 +414,7 @@
23 main_window->splitter_pos = appSettings.splitterPos;
24
25 /* Create menu bar */
26- main_window->menu_bar = gtk_menu_bar_new ();
27- gtk_box_pack_start ( GTK_BOX ( main_window->main_vbox ),
28- main_window->menu_bar, FALSE, FALSE, 0 );
29+ main_window->menu_bar = gtk_menu_new ();
30
31 main_window->accel_group = gtk_accel_group_new ();
32 fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) & main_window->open_side_pane_menu;
33Index: pcmanfm-0.3.2-beta/src/main.c
34===================================================================
35--- pcmanfm-0.3.2-beta.orig/src/main.c 2007-04-26 09:09:15.000000000 +0100
36+++ pcmanfm-0.3.2-beta/src/main.c 2007-04-26 09:21:40.000000000 +0100
37@@ -32,6 +32,8 @@
38 #include "glade-support.h"
39 #include "settings.h"
40
41+#include "owlwindowmenu.h"
42+
43 static char* init_path = NULL;
44
45 static int sock;
46@@ -171,6 +173,10 @@
47 gtk_window_set_default_size( GTK_WINDOW( main_window ),
48 appSettings.width, appSettings.height );
49 gtk_widget_show ( GTK_WIDGET( main_window ) );
50+ gtk_widget_show_all (main_window->menu_bar);
51+ owl_set_window_menu (GTK_WINDOW(main_window),
52+ GTK_MENU(main_window->menu_bar));
53+
54 return main_window;
55 }
56 #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"
2DESCRIPTION = "procfs tools" 2DESCRIPTION = "procfs tools"
3SECTION = "x11" 3SECTION = "x11"
4PRIORITY = "optional" 4PRIORITY = "optional"
5DEPENDS = "gtk+" 5DEPENDS = "gtk+ libowl"
6
7PR="r1"
6 8
7SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
8 file://gnome-fs-directory.png \ 10 file://gnome-fs-directory.png \
@@ -10,7 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
10 file://gnome-mime-text-plain.png \ 12 file://gnome-mime-text-plain.png \
11 file://emblem-symbolic-link.png \ 13 file://emblem-symbolic-link.png \
12 file://desktop.patch;patch=1 \ 14 file://desktop.patch;patch=1 \
13 file://no-warnings.patch;patch=1" 15 file://no-warnings.patch;patch=1 \
16 file://owl-window-menu.patch;patch=1"
14 17
15EXTRA_OECONF = "--enable-inotify --disable-hal" 18EXTRA_OECONF = "--enable-inotify --disable-hal"
16 19