summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-12-19 12:39:28 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-12-19 12:39:28 +0000
commit30f6da8fe5ddcb6571a3c626748043215e6e383b (patch)
tree21f6eaf05a87849463c8b7ad716554e0d2f5f3bd
parentc6b6c97120a0aa5ac9c416904e99264aada73137 (diff)
downloadpoky-30f6da8fe5ddcb6571a3c626748043215e6e383b.tar.gz
dates: refreshed patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3360 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/pimlico/files/dates-owl-window-menu.patch87
1 files changed, 55 insertions, 32 deletions
diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch
index d47875dd65..6bde252ac3 100644
--- a/meta/packages/pimlico/files/dates-owl-window-menu.patch
+++ b/meta/packages/pimlico/files/dates-owl-window-menu.patch
@@ -1,21 +1,30 @@
1Index: trunk/src/Makefile.am 1---
2=================================================================== 2 src/Makefile.am | 2 +-
3--- trunk.orig/src/Makefile.am 2007-07-11 22:16:15.000000000 +0100 3 src/dates_gtk.c | 5 -----
4+++ trunk/src/Makefile.am 2007-07-13 08:21:11.000000000 +0100 4 src/dates_main.c | 5 +++++
5@@ -47,7 +47,7 @@ 5 src/dates_platform.h | 2 +-
6 libgtkdatesviewinclude_HEADERS = \ 6 4 files changed, 7 insertions(+), 7 deletions(-)
7 dates_view.h 7
8--- dates-0.4.5.orig/src/Makefile.am
9+++ dates-0.4.5/src/Makefile.am
10@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) \
11 dates_callbacks.h \
12 dates_callbacks.c \
13 gconf-bridge.h \
14 gconf-bridge.c
8 15
9-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la 16-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
10+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl 17+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
11 18
12 if USE_OWL 19 if USE_OWL
13 dates_LDADD += $(top_builddir)/libowl/libowl.la 20 dates_LDADD += $(top_builddir)/libowl/libowl.la
14Index: trunk/src/dates_gtk.c 21 endif
15=================================================================== 22
16--- trunk.orig/src/dates_gtk.c 2007-07-11 22:16:15.000000000 +0100 23--- dates-0.4.5.orig/src/dates_gtk.c
17+++ trunk/src/dates_gtk.c 2007-07-13 08:33:48.000000000 +0100 24+++ dates-0.4.5/src/dates_gtk.c
18@@ -32,10 +32,6 @@ 25@@ -30,14 +30,10 @@
26 #ifdef WITH_HILDON
27 #include <hildon/hildon-color-button.h>
19 #endif 28 #endif
20 29
21 #ifndef DATES_PLATFORM_create_main_window 30 #ifndef DATES_PLATFORM_create_main_window
@@ -26,7 +35,11 @@ Index: trunk/src/dates_gtk.c
26 static GtkWidget * 35 static GtkWidget *
27 create_main_window (DatesData * d, GtkWidget * toolbar, 36 create_main_window (DatesData * d, GtkWidget * toolbar,
28 GtkWidget * menu, GtkAccelGroup * accel_group) 37 GtkWidget * menu, GtkAccelGroup * accel_group)
29@@ -57,7 +53,6 @@ 38 {
39 GtkWidget *main_vbox;
40@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
41 main_vbox = gtk_vbox_new (FALSE, 0);
42 gtk_widget_show (main_vbox);
30 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); 43 gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
31 44
32 gtk_widget_show (menu); 45 gtk_widget_show (menu);
@@ -34,24 +47,13 @@ Index: trunk/src/dates_gtk.c
34 47
35 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); 48 gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
36 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); 49 gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
37Index: trunk/src/dates_platform.h
38===================================================================
39--- trunk.orig/src/dates_platform.h 2007-07-11 22:16:15.000000000 +0100
40+++ trunk/src/dates_platform.h 2007-07-13 08:21:11.000000000 +0100
41@@ -20,7 +20,7 @@
42 50
43 #include "dates_types.h"
44 51
45-#ifdef WITH_HILDON 52--- dates-0.4.5.orig/src/dates_main.c
46+#if 1 53+++ dates-0.4.5/src/dates_main.c
47 #define DATES_MENU_WITHOUT_BAR 1 54@@ -23,10 +23,12 @@
48 #endif 55 #include <math.h>
49 56 #include <libecal/e-cal-time-util.h>
50Index: trunk/src/dates_main.c
51===================================================================
52--- trunk.orig/src/dates_main.c 2007-07-11 22:16:15.000000000 +0100
53+++ trunk/src/dates_main.c 2007-07-13 08:36:11.000000000 +0100
54@@ -25,6 +25,8 @@
55 #include <libical/icaltime.h> 57 #include <libical/icaltime.h>
56 #include <gconf/gconf-client.h> 58 #include <gconf/gconf-client.h>
57 59
@@ -60,7 +62,11 @@ Index: trunk/src/dates_main.c
60 #include "dates_types.h" 62 #include "dates_types.h"
61 #include "dates_platform.h" 63 #include "dates_platform.h"
62 #include "dates_callbacks.h" 64 #include "dates_callbacks.h"
63@@ -566,6 +568,9 @@ 65
66 #include "gconf-bridge.h"
67@@ -564,10 +566,13 @@ main (int argc, char **argv)
68 gtk_widget_show (plug_widget);
69 } else {
64 gtk_widget_show (data.main_window); 70 gtk_widget_show (data.main_window);
65 } 71 }
66 72
@@ -70,3 +76,20 @@ Index: trunk/src/dates_main.c
70 gtk_main (); 76 gtk_main ();
71 77
72 /* clean up */ 78 /* clean up */
79 g_option_context_free (context);
80
81--- dates-0.4.5.orig/src/dates_platform.h
82+++ dates-0.4.5/src/dates_platform.h
83@@ -18,11 +18,11 @@
84 #ifndef DATES_UI_GTK_H
85 #define DATES_UI_GTK_H
86
87 #include "dates_types.h"
88
89-#ifdef WITH_HILDON
90+#if 1
91 #define DATES_MENU_WITHOUT_BAR 1
92 #endif
93
94 struct DatesData;
95