summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-07-13 07:48:40 +0000
committerTomas Frydrych <tf@openedhand.com>2007-07-13 07:48:40 +0000
commite9aba83fdff4dac223ba2dce930bfd51ab58bc95 (patch)
tree6e1bcebfb65c136f5c44bf47af24454cb5dc2e91 /meta
parentbf2ebd8ca10dd783b521870de80f2bd1d6ad3b3c (diff)
downloadpoky-e9aba83fdff4dac223ba2dce930bfd51ab58bc95.tar.gz
owl menu for contacts
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2176 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/pimlico/contacts_svn.bb5
-rw-r--r--meta/packages/pimlico/files/contacts-owl-window-menu.patch52
2 files changed, 56 insertions, 1 deletions
diff --git a/meta/packages/pimlico/contacts_svn.bb b/meta/packages/pimlico/contacts_svn.bb
index 9a5fe92574..a61fc66a84 100644
--- a/meta/packages/pimlico/contacts_svn.bb
+++ b/meta/packages/pimlico/contacts_svn.bb
@@ -5,12 +5,15 @@ require contacts.inc
5#RRECOMMENDS += "gnome-vfs-plugin-http" 5#RRECOMMENDS += "gnome-vfs-plugin-http"
6 6
7PV = "0.5+svn${SRCDATE}" 7PV = "0.5+svn${SRCDATE}"
8PR = "r1"
8 9
9#DEFAULT_PREFERENCE = "-1" 10#DEFAULT_PREFERENCE = "-1"
10 11
11SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ 12SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
12 file://stock_contact.png \ 13 file://stock_contact.png \
13 file://stock_person.png" 14 file://stock_person.png \
15 file://contacts-owl-window-menu.patch;patch=1 \
16 "
14 17
15S = "${WORKDIR}/trunk" 18S = "${WORKDIR}/trunk"
16 19
diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch
new file mode 100644
index 0000000000..ad5e2f04fc
--- /dev/null
+++ b/meta/packages/pimlico/files/contacts-owl-window-menu.patch
@@ -0,0 +1,52 @@
1Index: trunk/src/contacts-gtk.c
2===================================================================
3--- trunk.orig/src/contacts-gtk.c 2007-07-11 22:16:08.000000000 +0100
4+++ trunk/src/contacts-gtk.c 2007-07-13 09:02:03.000000000 +0100
5@@ -179,8 +179,8 @@
6 vbox7 = gtk_vbox_new (FALSE, 0);
7 gtk_container_add (GTK_CONTAINER (main_window), vbox7);
8
9- main_menubar = gtk_menu_bar_new ();
10- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0);
11+ main_menubar = gtk_menu_new ();
12+ gtk_widget_show (main_menubar);
13
14 contacts_menu = gtk_menu_item_new_with_mnemonic (_("_Contacts"));
15 gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu);
16Index: trunk/src/Makefile.am
17===================================================================
18--- trunk.orig/src/Makefile.am 2007-04-19 15:41:14.000000000 +0100
19+++ trunk/src/Makefile.am 2007-07-13 08:50:58.000000000 +0100
20@@ -28,7 +28,7 @@
21 contacts-@FRONTEND@.c \
22 contacts-@FRONTEND@.h
23
24-contacts_LDADD = $(CONTACTS_LIBS)
25+contacts_LDADD = $(CONTACTS_LIBS) -lowl
26 contacts_LDFLAGS = @CONTACTS_LIBS@
27
28 MAINTAINERCLEANFILES = config.h.in Makefile.in
29Index: trunk/src/contacts-main.c
30===================================================================
31--- trunk.orig/src/contacts-main.c 2007-07-11 22:16:08.000000000 +0100
32+++ trunk/src/contacts-main.c 2007-07-13 09:02:30.000000000 +0100
33@@ -27,6 +27,8 @@
34 #include <libgnomevfs/gnome-vfs.h>
35 #endif
36
37+#include "owlwindowmenu.h"
38+
39 #include "bacon-message-connection.h"
40 #include "contacts-defs.h"
41 #include "contacts-utils.h"
42@@ -222,6 +224,10 @@
43 gtk_widget_show_all (widget);
44 }
45
46+ gtk_widget_show_all (data->ui->main_menubar);
47+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window),
48+ GTK_MENU (data->ui->main_menubar));
49+
50 gtk_main ();
51
52 /* if we have modified the current contact, but not saved it, do so now */