propagate from branch 'org.openembedded.dev' (head ab0d9a488e49d9ec307f6d034845a25a157b066b)

            to branch 'org.openembedded.dev.avr32' (head 4c5317ddb5784cda08980db89021f3fc1e9b786e)

3 files changed, 198 insertions, 0 deletions

diff --git a/packages/pimlico/files/contacts-owl-window-menu.patch b/packages/pimlico/files/contacts-owl-window-menu.patch
new file mode 100644
index 0000000000..ad5e2f04fc
--- /dev/null
+++ b/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 */
diff --git a/packages/pimlico/files/dates-owl-window-menu.patch b/packages/pimlico/files/dates-owl-window-menu.patch
new file mode 100644
index 0000000000..d47875dd65
--- /dev/null
+++ b/packages/pimlico/files/dates-owl-window-menu.patch
@@ -0,0 +1,72 @@
+Index: trunk/src/Makefile.am
+===================================================================
+--- trunk.orig/src/Makefile.am	2007-07-11 22:16:15.000000000 +0100
++++ trunk/src/Makefile.am	2007-07-13 08:21:11.000000000 +0100
+@@ -47,7 +47,7 @@
+ libgtkdatesviewinclude_HEADERS = \
+ 	dates_view.h
+ 
+-dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la
++dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la -lowl
+ 
+ if USE_OWL
+ dates_LDADD += $(top_builddir)/libowl/libowl.la
+Index: trunk/src/dates_gtk.c
+===================================================================
+--- trunk.orig/src/dates_gtk.c	2007-07-11 22:16:15.000000000 +0100
++++ trunk/src/dates_gtk.c	2007-07-13 08:33:48.000000000 +0100
+@@ -32,10 +32,6 @@
+ #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)
+@@ -57,7 +53,6 @@
+ 	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);
+Index: trunk/src/dates_platform.h
+===================================================================
+--- trunk.orig/src/dates_platform.h	2007-07-11 22:16:15.000000000 +0100
++++ trunk/src/dates_platform.h	2007-07-13 08:21:11.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "dates_types.h"
+ 
+-#ifdef WITH_HILDON
++#if 1
+ #define DATES_MENU_WITHOUT_BAR 1
+ #endif
+ 
+Index: trunk/src/dates_main.c
+===================================================================
+--- trunk.orig/src/dates_main.c	2007-07-11 22:16:15.000000000 +0100
++++ trunk/src/dates_main.c	2007-07-13 08:36:11.000000000 +0100
+@@ -25,6 +25,8 @@
+ #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"
+@@ -566,6 +568,9 @@
+ 		gtk_widget_show (data.main_window);
+ 	}
+ 
++	owl_set_window_menu (GTK_WINDOW (data.main_window),
++			     GTK_MENU (data.main_menu));
++
+ 	gtk_main ();
+ 
+ 	/* clean up */
diff --git a/packages/pimlico/files/tasks-owl.diff b/packages/pimlico/files/tasks-owl.diff
new file mode 100644
index 0000000000..ea867d890d
--- /dev/null
+++ b/packages/pimlico/files/tasks-owl.diff
@@ -0,0 +1,74 @@
+Index: src/gtk/tasks-ui.xml
+===================================================================
+--- src/gtk/tasks-ui.xml	(revision 288)
++++ src/gtk/tasks-ui.xml	(working copy)
+@@ -10,10 +10,8 @@
+       <menuitem action="DeleteTask"/>
+       <menuitem action="PurgeTasks"/>
+       <separator/>
++      <menuitem action="About"/>
+       <menuitem action="Quit"/>
+     </menu>
+-    <menu action="HelpMenu">
+-      <menuitem action="About"/>
+-    </menu>
+   </menubar>
+ </ui>
+Index: src/gtk/main.c
+===================================================================
+--- src/gtk/main.c	(revision 288)
++++ 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-category-group.h>
+@@ -462,17 +463,6 @@
+                          NULL);
+ }
+ 
+-/*
+- * Callback from the UI manager with the GtkMenu widget. Pack and add this to
+- * the container.
+- */
+-static void
+-ui_add_widget (GtkUIManager *ui, GtkWidget *widget, GtkContainer *container)
+-{
+-  gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+-  gtk_widget_show (widget);
+-}
+-
+ /* TODO: split into global actions and actions that require a task to be selected */
+ static const GtkActionEntry actions[] = 
+ {
+@@ -563,11 +553,12 @@
+   }
+   /* Bind the accelerators */
+   gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
+-  g_signal_connect (ui_manager, "add-widget", G_CALLBACK (ui_add_widget), top_box);
+ 
+   /* Do this so that the menu is packed now instead of in the idle loop */
+   gtk_ui_manager_ensure_update (ui_manager);
+-
++  owl_set_window_menu_item (GTK_WINDOW (window),
++                            GTK_MENU_ITEM (gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu")));
++  
+   box = gtk_vbox_new (FALSE, 4);
+   gtk_container_set_border_width (GTK_CONTAINER (box), 4);
+   gtk_container_add (GTK_CONTAINER (top_box), box);
+Index: src/gtk/Makefile.am
+===================================================================
+--- src/gtk/Makefile.am	(revision 288)
++++ src/gtk/Makefile.am	(working copy)
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = tasks
+ tasks_CPPFLAGS = -I$(top_srcdir)/
+ tasks_CFLAGS = -Wall $(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 \