diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/pimlico/contacts-0.8 | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/pimlico/contacts-0.8')
| -rw-r--r-- | recipes/pimlico/contacts-0.8/contacts-owl-window-menu.patch | 52 | ||||
| -rw-r--r-- | recipes/pimlico/contacts-0.8/contacts-util-fixup.diff | 13 |
2 files changed, 65 insertions, 0 deletions
diff --git a/recipes/pimlico/contacts-0.8/contacts-owl-window-menu.patch b/recipes/pimlico/contacts-0.8/contacts-owl-window-menu.patch new file mode 100644 index 0000000000..1fbf1dcc2a --- /dev/null +++ b/recipes/pimlico/contacts-0.8/contacts-owl-window-menu.patch @@ -0,0 +1,52 @@ +Index: contacts-0.5/src/contacts-gtk.c +=================================================================== +--- contacts-0.5.orig/src/contacts-gtk.c 2007-04-20 14:35:36.000000000 +0100 ++++ contacts-0.5/src/contacts-gtk.c 2007-07-13 10:47:52.000000000 +0100 +@@ -178,8 +178,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: contacts-0.5/src/Makefile.am +=================================================================== +--- contacts-0.5.orig/src/Makefile.am 2007-03-02 11:17:00.000000000 +0000 ++++ contacts-0.5/src/Makefile.am 2007-07-13 10:47:52.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: contacts-0.5/src/contacts-main.c +=================================================================== +--- contacts-0.5.orig/src/contacts-main.c 2007-04-20 15:46:23.000000000 +0100 ++++ contacts-0.5/src/contacts-main.c 2007-07-13 10:53:44.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" +@@ -230,6 +232,10 @@ + /* fix icon sizes to 16x16 for the moment... */ + gtk_rc_parse_string ("gtk_icon_sizes=\"gtk-button=16,16:gtk-menu=16,16\""); + ++ 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 (); + + /* Unload the addressbook */ diff --git a/recipes/pimlico/contacts-0.8/contacts-util-fixup.diff b/recipes/pimlico/contacts-0.8/contacts-util-fixup.diff new file mode 100644 index 0000000000..95c3dbb699 --- /dev/null +++ b/recipes/pimlico/contacts-0.8/contacts-util-fixup.diff @@ -0,0 +1,13 @@ +Index: contacts-0.8/src/contacts-utils.h +=================================================================== +--- contacts-0.8.orig/src/contacts-utils.h 2008-10-30 13:42:03.527971013 +0300 ++++ contacts-0.8/src/contacts-utils.h 2008-10-30 13:42:08.140177662 +0300 +@@ -22,8 +22,6 @@ + #include <libebook/e-book.h> + #include "contacts-defs.h" + +-char *e_util_unicode_get_utf8 (const char *text, gunichar * out); +- + const char *kozo_utf8_strstrcasestrip (const char *haystack, + const gunichar * needle); + |