summaryrefslogtreecommitdiffstats
path: root/meta/packages/pimlico
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-07-13 07:23:29 +0000
committerTomas Frydrych <tf@openedhand.com>2007-07-13 07:23:29 +0000
commitbf2ebd8ca10dd783b521870de80f2bd1d6ad3b3c (patch)
tree1b50df734ebb168e721c513659c34c9be401856b /meta/packages/pimlico
parent10bb42b8e775dbafc0d80ee2e98e405f4172f39b (diff)
downloadpoky-bf2ebd8ca10dd783b521870de80f2bd1d6ad3b3c.tar.gz
owl menu for dates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2175 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/pimlico')
-rw-r--r--meta/packages/pimlico/dates_svn.bb5
-rw-r--r--meta/packages/pimlico/files/dates-owl-window-menu.patch72
2 files changed, 76 insertions, 1 deletions
diff --git a/meta/packages/pimlico/dates_svn.bb b/meta/packages/pimlico/dates_svn.bb
index 2357efda1a..1dadbc0ec9 100644
--- a/meta/packages/pimlico/dates_svn.bb
+++ b/meta/packages/pimlico/dates_svn.bb
@@ -4,5 +4,8 @@ DEFAULT_PREFERENCE = "-1"
4 4
5PV = "0.4.3+svn${SRCDATE}" 5PV = "0.4.3+svn${SRCDATE}"
6S = "${WORKDIR}/trunk" 6S = "${WORKDIR}/trunk"
7PR = "r1"
7 8
8SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" 9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
10 file://dates-owl-window-menu.patch;patch=1 \
11 "
diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch
new file mode 100644
index 0000000000..c57cc5c367
--- /dev/null
+++ b/meta/packages/pimlico/files/dates-owl-window-menu.patch
@@ -0,0 +1,72 @@
1Index: trunk/src/Makefile.am
2===================================================================
3--- trunk.orig/src/Makefile.am 2007-07-11 22:16:15.000000000 +0100
4+++ trunk/src/Makefile.am 2007-07-13 08:21:11.000000000 +0100
5@@ -47,7 +47,7 @@
6 libgtkdatesviewinclude_HEADERS = \
7 dates_view.h
8
9-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
10+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
11
12 if USE_OWL
13 dates_LDADD += $(top_builddir)/libowl/libowl.la
14Index: trunk/src/dates_gtk.c
15===================================================================
16--- trunk.orig/src/dates_gtk.c 2007-07-11 22:16:15.000000000 +0100
17+++ trunk/src/dates_gtk.c 2007-07-13 08:33:48.000000000 +0100
18@@ -32,10 +32,6 @@
19 #endif
20
21 #ifndef DATES_PLATFORM_create_main_window
22-/* the default implementation assumes that menu is GtkMenuBar */
23-#ifdef DATES_MENU_WITHOUT_BAR
24-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!!
25-#endif
26 static GtkWidget *
27 create_main_window (DatesData * d, GtkWidget * toolbar,
28 GtkWidget * menu, GtkAccelGroup * accel_group)
29@@ -57,7 +53,6 @@
30 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
31
32 gtk_widget_show (menu);
33- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0);
34
35 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
36 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
37Index: trunk/src/dates_platform.h
38===================================================================
39--- trunk.orig/src/dates_platform.h 2007-07-11 22:16:15.000000000 +0100
40+++ trunk/src/dates_platform.h 2007-07-13 08:21:11.000000000 +0100
41@@ -20,7 +20,7 @@
42
43 #include "dates_types.h"
44
45-#ifdef WITH_HILDON
46+#if 1
47 #define DATES_MENU_WITHOUT_BAR 1
48 #endif
49
50Index: trunk/src/dates_main.c
51===================================================================
52--- trunk.orig/src/dates_main.c 2007-07-11 22:16:15.000000000 +0100
53+++ trunk/src/dates_main.c 2007-07-13 08:36:11.000000000 +0100
54@@ -25,6 +25,8 @@
55 #include <libical/icaltime.h>
56 #include <gconf/gconf-client.h>
57
58+#include "owlwindowmenu.h"
59+
60 #include "dates_types.h"
61 #include "dates_platform.h"
62 #include "dates_callbacks.h"
63@@ -566,6 +568,9 @@
64 gtk_widget_show (data.main_window);
65 }
66
67+ owl_set_window_menu (GTK_WINDOW (data.main_window),
68+ GTK_MENU (data.main_menu));
69+
70 gtk_main ();
71
72 /* clean up */