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/files | |
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/files')
-rw-r--r-- | recipes/pimlico/files/contacts-owl-window-menu.patch | 52 | ||||
-rw-r--r-- | recipes/pimlico/files/dates-owl-window-menu.patch | 95 | ||||
-rw-r--r-- | recipes/pimlico/files/stock_contact.png | bin | 0 -> 2311 bytes | |||
-rw-r--r-- | recipes/pimlico/files/stock_person.png | bin | 0 -> 2280 bytes | |||
-rw-r--r-- | recipes/pimlico/files/tasks-owl.diff | 62 | ||||
-rw-r--r-- | recipes/pimlico/files/tasks-single.diff | 9 |
6 files changed, 218 insertions, 0 deletions
diff --git a/recipes/pimlico/files/contacts-owl-window-menu.patch b/recipes/pimlico/files/contacts-owl-window-menu.patch new file mode 100644 index 0000000000..ad5e2f04fc --- /dev/null +++ b/recipes/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 */ diff --git a/recipes/pimlico/files/dates-owl-window-menu.patch b/recipes/pimlico/files/dates-owl-window-menu.patch new file mode 100644 index 0000000000..6bde252ac3 --- /dev/null +++ b/recipes/pimlico/files/dates-owl-window-menu.patch @@ -0,0 +1,95 @@ +--- + src/Makefile.am | 2 +- + src/dates_gtk.c | 5 ----- + src/dates_main.c | 5 +++++ + src/dates_platform.h | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +--- dates-0.4.5.orig/src/Makefile.am ++++ dates-0.4.5/src/Makefile.am +@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \ + dates_callbacks.h \ + dates_callbacks.c \ + gconf-bridge.h \ + gconf-bridge.c + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la ++dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl + + if USE_OWL + dates_LDADD += $(top_builddir)/libowl/libowl.la + endif + +--- dates-0.4.5.orig/src/dates_gtk.c ++++ dates-0.4.5/src/dates_gtk.c +@@ -30,14 +30,10 @@ + #ifdef WITH_HILDON + #include <hildon/hildon-color-button.h> + #endif + + #ifndef DATES_PLATFORM_create_main_window +-/* the default implementation assumes that menu is GtkMenuBar */ +-#ifdef DATES_MENU_WITHOUT_BAR +-#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!! +-#endif + static GtkWidget * + create_main_window (DatesData * d, GtkWidget * toolbar, + GtkWidget * menu, GtkAccelGroup * accel_group) + { + GtkWidget *main_vbox; +@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi + main_vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (main_vbox); + gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); + + gtk_widget_show (menu); +- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0); + + gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); + + +--- dates-0.4.5.orig/src/dates_main.c ++++ dates-0.4.5/src/dates_main.c +@@ -23,10 +23,12 @@ + #include <math.h> + #include <libecal/e-cal-time-util.h> + #include <libical/icaltime.h> + #include <gconf/gconf-client.h> + ++#include <gtk/gtkmenuitem.h> ++#include "owlwindowmenu.h" + #include "dates_types.h" + #include "dates_platform.h" + #include "dates_callbacks.h" + + #include "gconf-bridge.h" +@@ -564,10 +566,13 @@ main (int argc, char **argv) + gtk_widget_show (plug_widget); + } else { + gtk_widget_show (data.main_window); + } + ++ owl_set_window_menu (GTK_WINDOW (data.main_window), ++ GTK_MENU (data.main_menu)); ++ + gtk_main (); + + /* clean up */ + g_option_context_free (context); + +--- dates-0.4.5.orig/src/dates_platform.h ++++ dates-0.4.5/src/dates_platform.h +@@ -18,11 +18,11 @@ + #ifndef DATES_UI_GTK_H + #define DATES_UI_GTK_H + + #include "dates_types.h" + +-#ifdef WITH_HILDON ++#if 1 + #define DATES_MENU_WITHOUT_BAR 1 + #endif + + struct DatesData; + diff --git a/recipes/pimlico/files/stock_contact.png b/recipes/pimlico/files/stock_contact.png Binary files differnew file mode 100644 index 0000000000..123b4485ac --- /dev/null +++ b/recipes/pimlico/files/stock_contact.png diff --git a/recipes/pimlico/files/stock_person.png b/recipes/pimlico/files/stock_person.png Binary files differnew file mode 100644 index 0000000000..2b1328b4e2 --- /dev/null +++ b/recipes/pimlico/files/stock_person.png diff --git a/recipes/pimlico/files/tasks-owl.diff b/recipes/pimlico/files/tasks-owl.diff new file mode 100644 index 0000000000..ce1ed9db7e --- /dev/null +++ b/recipes/pimlico/files/tasks-owl.diff @@ -0,0 +1,62 @@ +Index: src/gtk/tasks-ui.xml +=================================================================== +--- src/gtk/tasks-ui.xml (revision 338) ++++ src/gtk/tasks-ui.xml (working copy) +@@ -7,17 +7,14 @@ + <menuitem action="EditTask"/> + <menuitem action="CompleteTask"/> + <separator/> ++ <menuitem action="Undo"/> ++ <menuitem action="Redo"/> ++ <separator/> + <menuitem action="DeleteTask"/> + <menuitem action="PurgeTasks"/> + <separator/> ++ <menuitem action="About"/> + <menuitem action="Quit"/> + </menu> +- <menu action="EditMenu"> +- <menuitem action="Undo"/> +- <menuitem action="Redo"/> +- </menu> +- <menu action="HelpMenu"> +- <menuitem action="About"/> +- </menu> + </menubar> + </ui> +Index: src/gtk/main.c +=================================================================== +--- src/gtk/main.c (revision 338) ++++ src/gtk/main.c (working copy) +@@ -21,6 +21,7 @@ + #include <libecal/e-cal.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> ++#include <owlwindowmenu.h> + + #include <libkoto/ical-util.h> + #include <libkoto/koto-actions.h> +@@ -564,8 +565,8 @@ + gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager)); + gtk_ui_manager_ensure_update (ui_manager); + +- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); +- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0); ++ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"); ++ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu)); + + box = gtk_vbox_new (FALSE, 4); + gtk_container_set_border_width (GTK_CONTAINER (box), 4); +Index: src/gtk/Makefile.am +=================================================================== +--- src/gtk/Makefile.am (revision 338) ++++ src/gtk/Makefile.am (working copy) +@@ -4,7 +4,7 @@ + bin_PROGRAMS = tasks + tasks_CPPFLAGS = -I$(top_srcdir)/ + tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) +-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) ++tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl + + tasks_SOURCES = \ + main.c \ diff --git a/recipes/pimlico/files/tasks-single.diff b/recipes/pimlico/files/tasks-single.diff new file mode 100644 index 0000000000..dd807ea256 --- /dev/null +++ b/recipes/pimlico/files/tasks-single.diff @@ -0,0 +1,9 @@ +Index: tasks/data/tasks.desktop.in +=================================================================== +--- tasks/data/tasks.desktop.in (revision 115) ++++ tasks/data/tasks.desktop.in (working copy) +@@ -9,3 +9,4 @@ + Categories=GTK;Application;Office;ProjectManagement; + Terminal=false + StartupNotify=true ++SingleInstance=true |