From d8869f3ac30fd3640d8f9b27d7c1c922ef160216 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 18 Aug 2009 13:10:47 +0100 Subject: pimlico: Convert recipes to gnome git Signed-off-by: Richard Purdie --- .../pimlico/files/contacts-owl-window-menu.patch | 52 ----------- .../pimlico/files/dates-owl-window-menu.patch | 95 --------------------- meta/packages/pimlico/files/stock_contact.png | Bin 2311 -> 0 bytes meta/packages/pimlico/files/stock_person.png | Bin 2280 -> 0 bytes meta/packages/pimlico/files/tasks-owl.diff | 62 -------------- 5 files changed, 209 deletions(-) delete mode 100644 meta/packages/pimlico/files/contacts-owl-window-menu.patch delete mode 100644 meta/packages/pimlico/files/dates-owl-window-menu.patch delete mode 100644 meta/packages/pimlico/files/stock_contact.png delete mode 100644 meta/packages/pimlico/files/stock_person.png delete mode 100644 meta/packages/pimlico/files/tasks-owl.diff (limited to 'meta/packages/pimlico/files') diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch deleted file mode 100644 index 4b9238b43..000000000 --- a/meta/packages/pimlico/files/contacts-owl-window-menu.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: contacts-0.9/src/contacts-gtk.c -=================================================================== ---- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100 -+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100 -@@ -220,8 +220,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 (_("C_ontacts")); - gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu); -Index: contacts-0.9/src/Makefile.am -=================================================================== ---- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100 -+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100 -@@ -40,7 +40,7 @@ - contacts-@FRONTEND@.c \ - contacts-@FRONTEND@.h - --contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl - - contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@ - -Index: contacts-0.9/src/contacts-main.c -=================================================================== ---- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100 -+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100 -@@ -27,6 +27,8 @@ - #include - #endif - -+#include -+ - #include "bacon-message-connection.h" - #include "contacts-defs.h" - #include "contacts-utils.h" -@@ -266,6 +268,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/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch deleted file mode 100644 index a52fd5741..000000000 --- a/meta/packages/pimlico/files/dates-owl-window-menu.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- - 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 - #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 - #include - #include - #include - -+#include -+#include - #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/meta/packages/pimlico/files/stock_contact.png b/meta/packages/pimlico/files/stock_contact.png deleted file mode 100644 index 123b4485a..000000000 Binary files a/meta/packages/pimlico/files/stock_contact.png and /dev/null differ diff --git a/meta/packages/pimlico/files/stock_person.png b/meta/packages/pimlico/files/stock_person.png deleted file mode 100644 index 2b1328b4e..000000000 Binary files a/meta/packages/pimlico/files/stock_person.png and /dev/null differ diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/files/tasks-owl.diff deleted file mode 100644 index e4078066f..000000000 --- a/meta/packages/pimlico/files/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 \ -- cgit v1.2.3