diff options
Diffstat (limited to 'meta/recipes-sato/pimlico/tasks')
-rw-r--r-- | meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/pimlico/tasks/tasks-owl.diff | 62 |
2 files changed, 88 insertions, 0 deletions
diff --git a/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch new file mode 100644 index 000000000..6c458d260 --- /dev/null +++ b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch @@ -0,0 +1,26 @@ +commit ea52d46d691c5fce4473ea4e24a35411381f3a65 +Author: Ross Burton <ross@linux.intel.com> +Date: Fri Aug 21 14:23:21 2009 +0100 + + Fix compilation on pre-GTK+ 2.16 + +diff --git a/libkoto/koto-field-editor-factory.c b/libkoto/koto-field-editor-factory.c +index bb776ab..d0e5328 100644 +--- a/libkoto/koto-field-editor-factory.c ++++ b/libkoto/koto-field-editor-factory.c +@@ -132,6 +132,7 @@ entry_set (GtkWidget *widget, icalproperty *prop) + * URL entries. + */ + ++#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME + static void + url_entry_icon_clicked (GtkEntry *entry, + GtkEntryIconPosition icon_pos, +@@ -146,7 +147,6 @@ url_entry_icon_clicked (GtkEntry *entry, + } + } + +-#if HAVE_DECL_GTK_ENTRY_SET_ICON_FROM_ICON_NAME + static void + on_url_entry_changed (GtkEntry *entry) + { diff --git a/meta/recipes-sato/pimlico/tasks/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff new file mode 100644 index 000000000..e4078066f --- /dev/null +++ b/meta/recipes-sato/pimlico/tasks/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 <libowl/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 \ |