From f39a6071a15bae42e5d353aa0512b177dd6ca469 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 19 Dec 2007 13:24:27 +0000 Subject: tasks: update to 0.13 --- packages/pimlico/tasks-0.12/.mtn2git_empty | 0 packages/pimlico/tasks-0.12/tasks-owl.diff | 62 ------------------------------ packages/pimlico/tasks-0.13/.mtn2git_empty | 0 packages/pimlico/tasks-0.13/tasks-owl.diff | 62 ++++++++++++++++++++++++++++++ packages/pimlico/tasks_0.12.bb | 4 -- packages/pimlico/tasks_0.13.bb | 4 ++ 6 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 packages/pimlico/tasks-0.12/.mtn2git_empty delete mode 100644 packages/pimlico/tasks-0.12/tasks-owl.diff create mode 100644 packages/pimlico/tasks-0.13/.mtn2git_empty create mode 100644 packages/pimlico/tasks-0.13/tasks-owl.diff delete mode 100644 packages/pimlico/tasks_0.12.bb create mode 100644 packages/pimlico/tasks_0.13.bb (limited to 'packages') diff --git a/packages/pimlico/tasks-0.12/.mtn2git_empty b/packages/pimlico/tasks-0.12/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/pimlico/tasks-0.12/tasks-owl.diff b/packages/pimlico/tasks-0.12/tasks-owl.diff deleted file mode 100644 index ce1ed9db7e..0000000000 --- a/packages/pimlico/tasks-0.12/tasks-owl.diff +++ /dev/null @@ -1,62 +0,0 @@ -Index: src/gtk/tasks-ui.xml -=================================================================== ---- src/gtk/tasks-ui.xml (revision 338) -+++ src/gtk/tasks-ui.xml (working copy) -@@ -7,17 +7,14 @@ - - - -+ -+ -+ - - - -+ - - -- -- -- -- -- -- -- - - -Index: src/gtk/main.c -=================================================================== ---- src/gtk/main.c (revision 338) -+++ src/gtk/main.c (working copy) -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -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/packages/pimlico/tasks-0.13/.mtn2git_empty b/packages/pimlico/tasks-0.13/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pimlico/tasks-0.13/tasks-owl.diff b/packages/pimlico/tasks-0.13/tasks-owl.diff new file mode 100644 index 0000000000..ce1ed9db7e --- /dev/null +++ b/packages/pimlico/tasks-0.13/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 @@ + + + ++ ++ ++ + + + ++ + + +- +- +- +- +- +- +- + + +Index: src/gtk/main.c +=================================================================== +--- src/gtk/main.c (revision 338) ++++ src/gtk/main.c (working copy) +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -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/packages/pimlico/tasks_0.12.bb b/packages/pimlico/tasks_0.12.bb deleted file mode 100644 index ff8da563e6..0000000000 --- a/packages/pimlico/tasks_0.12.bb +++ /dev/null @@ -1,4 +0,0 @@ -require tasks.inc - -SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ - file://tasks-owl.diff;patch=1;pnum=0" diff --git a/packages/pimlico/tasks_0.13.bb b/packages/pimlico/tasks_0.13.bb new file mode 100644 index 0000000000..ff8da563e6 --- /dev/null +++ b/packages/pimlico/tasks_0.13.bb @@ -0,0 +1,4 @@ +require tasks.inc + +SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ + file://tasks-owl.diff;patch=1;pnum=0" -- cgit v1.2.3