summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-07-13 09:15:13 +0000
committerRoss Burton <ross@openedhand.com>2007-07-13 09:15:13 +0000
commit9f45dd9cbcfdc78534fcf1c64e6eff3694c25c21 (patch)
tree174e23784d20a17e4cbeb059874ac9374456d982 /meta/packages
parentb6a445c6309451d9a4ef30cf375482cfc988496b (diff)
downloadpoky-9f45dd9cbcfdc78534fcf1c64e6eff3694c25c21.tar.gz
Add a owlmenu patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2179 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/pimlico/files/tasks-owl.diff74
-rw-r--r--meta/packages/pimlico/tasks.inc2
-rw-r--r--meta/packages/pimlico/tasks_0.10.bb5
-rw-r--r--meta/packages/pimlico/tasks_svn.bb4
4 files changed, 82 insertions, 3 deletions
diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/files/tasks-owl.diff
new file mode 100644
index 0000000000..ea867d890d
--- /dev/null
+++ b/meta/packages/pimlico/files/tasks-owl.diff
@@ -0,0 +1,74 @@
1Index: src/gtk/tasks-ui.xml
2===================================================================
3--- src/gtk/tasks-ui.xml (revision 288)
4+++ src/gtk/tasks-ui.xml (working copy)
5@@ -10,10 +10,8 @@
6 <menuitem action="DeleteTask"/>
7 <menuitem action="PurgeTasks"/>
8 <separator/>
9+ <menuitem action="About"/>
10 <menuitem action="Quit"/>
11 </menu>
12- <menu action="HelpMenu">
13- <menuitem action="About"/>
14- </menu>
15 </menubar>
16 </ui>
17Index: src/gtk/main.c
18===================================================================
19--- src/gtk/main.c (revision 288)
20+++ src/gtk/main.c (working copy)
21@@ -21,6 +21,7 @@
22 #include <libecal/e-cal.h>
23 #include <glib/gi18n.h>
24 #include <gtk/gtk.h>
25+#include <owlwindowmenu.h>
26
27 #include <libkoto/ical-util.h>
28 #include <libkoto/koto-category-group.h>
29@@ -462,17 +463,6 @@
30 NULL);
31 }
32
33-/*
34- * Callback from the UI manager with the GtkMenu widget. Pack and add this to
35- * the container.
36- */
37-static void
38-ui_add_widget (GtkUIManager *ui, GtkWidget *widget, GtkContainer *container)
39-{
40- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
41- gtk_widget_show (widget);
42-}
43-
44 /* TODO: split into global actions and actions that require a task to be selected */
45 static const GtkActionEntry actions[] =
46 {
47@@ -563,11 +553,12 @@
48 }
49 /* Bind the accelerators */
50 gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
51- g_signal_connect (ui_manager, "add-widget", G_CALLBACK (ui_add_widget), top_box);
52
53 /* Do this so that the menu is packed now instead of in the idle loop */
54 gtk_ui_manager_ensure_update (ui_manager);
55-
56+ owl_set_window_menu_item (GTK_WINDOW (window),
57+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu")));
58+
59 box = gtk_vbox_new (FALSE, 4);
60 gtk_container_set_border_width (GTK_CONTAINER (box), 4);
61 gtk_container_add (GTK_CONTAINER (top_box), box);
62Index: src/gtk/Makefile.am
63===================================================================
64--- src/gtk/Makefile.am (revision 288)
65+++ src/gtk/Makefile.am (working copy)
66@@ -4,7 +4,7 @@
67 bin_PROGRAMS = tasks
68 tasks_CPPFLAGS = -I$(top_srcdir)/
69 tasks_CFLAGS = -Wall $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
70-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
71+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
72
73 tasks_SOURCES = \
74 main.c \
diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
index 9b7c245ad3..2bb1c9265a 100644
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/packages/pimlico/tasks.inc
@@ -1,6 +1,6 @@
1DESCRIPTION = "Task list application" 1DESCRIPTION = "Task list application"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "glib-2.0 gtk+ eds-dbus" 4DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
5 5
6inherit autotools pkgconfig gtk-icon-cache 6inherit autotools pkgconfig gtk-icon-cache
diff --git a/meta/packages/pimlico/tasks_0.10.bb b/meta/packages/pimlico/tasks_0.10.bb
index 120b52542d..63d22328ff 100644
--- a/meta/packages/pimlico/tasks_0.10.bb
+++ b/meta/packages/pimlico/tasks_0.10.bb
@@ -1,4 +1,7 @@
1require tasks.inc 1require tasks.inc
2 2
3PR="r1"
4
3SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ 5SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
4 file://tasks-single.diff;patch=1" 6 file://tasks-single.diff;patch=1 \
7 file://tasks-owl.diff;patch=1;pnum=0"
diff --git a/meta/packages/pimlico/tasks_svn.bb b/meta/packages/pimlico/tasks_svn.bb
index 7ac374be08..1188d2d894 100644
--- a/meta/packages/pimlico/tasks_svn.bb
+++ b/meta/packages/pimlico/tasks_svn.bb
@@ -5,4 +5,6 @@ DEFAULT_PREFERENCE = "-1"
5PV = "0.10+svn${SRCDATE}" 5PV = "0.10+svn${SRCDATE}"
6S = "${WORKDIR}/trunk" 6S = "${WORKDIR}/trunk"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
9 file://tasks-single.diff;patch=1 \
10 file://tasks-owl.diff;patch=1"