diff options
| author | Tomas Frydrych <tf@openedhand.com> | 2007-07-13 07:48:40 +0000 |
|---|---|---|
| committer | Tomas Frydrych <tf@openedhand.com> | 2007-07-13 07:48:40 +0000 |
| commit | e9aba83fdff4dac223ba2dce930bfd51ab58bc95 (patch) | |
| tree | 6e1bcebfb65c136f5c44bf47af24454cb5dc2e91 /meta/packages/pimlico | |
| parent | bf2ebd8ca10dd783b521870de80f2bd1d6ad3b3c (diff) | |
| download | openembedded-core-e9aba83fdff4dac223ba2dce930bfd51ab58bc95.tar.gz openembedded-core-e9aba83fdff4dac223ba2dce930bfd51ab58bc95.tar.bz2 openembedded-core-e9aba83fdff4dac223ba2dce930bfd51ab58bc95.zip | |
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/packages/pimlico')
| -rw-r--r-- | meta/packages/pimlico/contacts_svn.bb | 5 | ||||
| -rw-r--r-- | meta/packages/pimlico/files/contacts-owl-window-menu.patch | 52 |
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 #RRECOMMENDS += "gnome-vfs-plugin-http" PV = "0.5+svn${SRCDATE}" +PR = "r1" #DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://stock_contact.png \ - file://stock_person.png" + file://stock_person.png \ + file://contacts-owl-window-menu.patch;patch=1 \ + " S = "${WORKDIR}/trunk" 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 @@ +Index: trunk/src/contacts-gtk.c +=================================================================== +--- trunk.orig/src/contacts-gtk.c 2007-07-11 22:16:08.000000000 +0100 ++++ trunk/src/contacts-gtk.c 2007-07-13 09:02:03.000000000 +0100 +@@ -179,8 +179,8 @@ + vbox7 = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (main_window), vbox7); + +- main_menubar = gtk_menu_bar_new (); +- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0); ++ main_menubar = gtk_menu_new (); ++ gtk_widget_show (main_menubar); + + contacts_menu = gtk_menu_item_new_with_mnemonic (_("_Contacts")); + gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu); +Index: trunk/src/Makefile.am +=================================================================== +--- trunk.orig/src/Makefile.am 2007-04-19 15:41:14.000000000 +0100 ++++ trunk/src/Makefile.am 2007-07-13 08:50:58.000000000 +0100 +@@ -28,7 +28,7 @@ + contacts-@FRONTEND@.c \ + contacts-@FRONTEND@.h + +-contacts_LDADD = $(CONTACTS_LIBS) ++contacts_LDADD = $(CONTACTS_LIBS) -lowl + contacts_LDFLAGS = @CONTACTS_LIBS@ + + MAINTAINERCLEANFILES = config.h.in Makefile.in +Index: trunk/src/contacts-main.c +=================================================================== +--- trunk.orig/src/contacts-main.c 2007-07-11 22:16:08.000000000 +0100 ++++ trunk/src/contacts-main.c 2007-07-13 09:02:30.000000000 +0100 +@@ -27,6 +27,8 @@ + #include <libgnomevfs/gnome-vfs.h> + #endif + ++#include "owlwindowmenu.h" ++ + #include "bacon-message-connection.h" + #include "contacts-defs.h" + #include "contacts-utils.h" +@@ -222,6 +224,10 @@ + gtk_widget_show_all (widget); + } + ++ gtk_widget_show_all (data->ui->main_menubar); ++ owl_set_window_menu (GTK_WINDOW (data->ui->main_window), ++ GTK_MENU (data->ui->main_menubar)); ++ + gtk_main (); + + /* if we have modified the current contact, but not saved it, do so now */ |