--- /dev/null
+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 */
--- /dev/null
+require contacts.inc
+
+PR = "r1"
+
+SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
+ file://stock_contact.png \
+ file://stock_person.png \
+ file://contacts-owl-window-menu.patch;patch=1 \
+ "
#RDEPENDS += "gnome-vfs-plugin-file"
#RRECOMMENDS += "gnome-vfs-plugin-http"
-PV = "0.5+svn${SRCDATE}"
+PV = "0.5+svnr${SRCREV}"
-DEFAULT_PREFERENCE = "-1"
+#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"
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
RDEPENDS = "libedata-cal"
-RCONFLICTS_${PN} = "openmoko-dates"
inherit autotools pkgconfig gtk-icon-cache
# EXTRA_OECONF = "--disable-debug"
-EXTRA_OECONF = "--enable-owl=true"
+EXTRA_OECONF = "--enable-owl=true --disable-dnd"
FILES_${PN} += "${datadir}/pixmaps/dates.png"
install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
}
-PRIVATE_LIBS = "libgtkdatesview.so.0"
--- /dev/null
+require dates.inc
+
+PR="r2"
+
+SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \
+ file://dates-owl-window-menu.patch;patch=1 \
+ "
DEFAULT_PREFERENCE = "-1"
-PV = "0.4.2+svn${SRCDATE}"
+PV = "0.4.4+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+ file://dates-owl-window-menu.patch;patch=1 \
+ "
--- /dev/null
+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 */
--- /dev/null
+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 */
--- /dev/null
+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 \
--- /dev/null
+Index: libkoto/koto-utils.c
+===================================================================
+--- libkoto/koto-utils.c (revision 294)
++++ libkoto/koto-utils.c (revision 295)
+@@ -25,6 +25,7 @@
+
+ typedef struct {
+ GtkWindow *window;
++ GtkTreeModel *model;
+ char *title;
+ } WindowData;
+
+@@ -67,19 +68,21 @@
+ /*
+ * Update the window title, generally as the number of tasks has changed.
+ */
+-static void
+-update_title (WindowData *data, GtkTreeModel *model)
++static gboolean
++update_title (gpointer user_data)
+ {
++ WindowData *data = user_data;
+ int count = 0;
+ char *title;
+
+ g_assert (data);
+- g_assert (model);
+
+- gtk_tree_model_foreach (model, count_pending, &count);
++ gtk_tree_model_foreach (data->model, count_pending, &count);
+ title = g_strdup_printf (data->title, count);
+ gtk_window_set_title (data->window, title);
+ g_free (title);
++
++ return FALSE;
+ }
+
+ /*
+@@ -89,7 +92,7 @@
+ static void
+ on_row_inserted (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, WindowData *data)
+ {
+- update_title (data, model);
++ g_idle_add (update_title, data);
+ }
+
+ /*
+@@ -99,7 +102,7 @@
+ static void
+ on_row_deleted (GtkTreeModel *model, GtkTreePath *path, WindowData *data)
+ {
+- update_title (data, model);
++ g_idle_add (update_title, data);
+ }
+
+ /*
+@@ -135,6 +138,7 @@
+
+ data = g_slice_new (WindowData);
+ data->window = window;
++ data->model = model;
+ data->title = g_strdup (title);
+
+ g_object_weak_ref (G_OBJECT (model), on_weak_notify, data);
+@@ -145,5 +149,5 @@
+ "signal::row-deleted", G_CALLBACK (on_row_deleted), data,
+ NULL);
+
+- update_title (data, model);
++ update_title (data);
+ }
DESCRIPTION = "Task list application"
LICENSE = "GPL"
SECTION = "x11"
-DEPENDS = "glib-2.0 libsexy gtk+ eds-dbus"
+DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
inherit autotools pkgconfig gtk-icon-cache
--- /dev/null
+require tasks.inc
+
+PR="r2"
+
+SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
+ file://tasks-single.diff;patch=1 \
+ file://delete-crash.diff;patch=1;pnum=0 \
+ file://tasks-owl.diff;patch=1;pnum=0"
DEFAULT_PREFERENCE = "-1"
-PV = "0.4+svn${SRCDATE}"
+PV = "0.10+svnr${SRCREV}"
S = "${WORKDIR}/trunk"
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+ file://tasks-single.diff;patch=1 \
+ file://tasks-owl.diff;patch=1"
git.openpandora.org / openembedded.git / commitdiff