wok-6.x view kazehakase/stuff/kazehakase-rev3873-gtk222.patch @ rev 20320

merge
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 20 13:29:24 2018 +0200 (2018-05-20)
parents
children
line source
1 --- kazehakase-0.5.8-svn3873_trunk/src/kz-notebook.c.gtk222 2009-10-16 23:53:10.000000000 +0900
2 +++ kazehakase-0.5.8-svn3873_trunk/src/kz-notebook.c 2010-09-08 23:44:28.000000000 +0900
3 @@ -82,7 +82,11 @@
4 guint page_num,
5 gpointer data);
6 static void switch_page (GtkNotebook *notebook,
7 +#if GTK_CHECK_VERSION(2, 21, 6)
8 + gpointer page,
9 +#else
10 GtkNotebookPage *page,
11 +#endif
12 guint page_num);
14 static void cb_page_reordered (GtkNotebook *notebook,
15 @@ -322,7 +326,13 @@
16 }
18 static void
19 -switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num)
20 +switch_page (GtkNotebook *notebook,
21 +#if GTK_CHECK_VERSION(2, 21, 6)
22 + gpointer page,
23 +#else
24 + GtkNotebookPage *page,
25 +#endif
26 + guint page_num)
27 {
28 KzTabLabel *tab;
29 gchar *title;
30 --- kazehakase-0.5.8-svn3873_trunk/src/kz-window.c.gtk222 2010-05-04 00:38:44.000000000 +0900
31 +++ kazehakase-0.5.8-svn3873_trunk/src/kz-window.c 2010-09-08 23:40:40.000000000 +0900
32 @@ -213,11 +213,19 @@
33 guint page_num,
34 KzWindow *kz);
35 static void cb_notebook_switch_page (GtkNotebook *notebook,
36 +#if GTK_CHECK_VERSION(2, 21, 6)
37 + gpointer page,
38 +#else
39 GtkNotebookPage *page,
40 +#endif
41 guint page_num,
42 KzWindow *kz);
43 static void cb_notebook_switch_page_after (GtkNotebook *notebook,
44 +#if GTK_CHECK_VERSION(2, 21, 6)
45 + gpointer page,
46 +#else
47 GtkNotebookPage *page,
48 +#endif
49 guint page_num,
50 KzWindow *kz);
51 static void cb_gesture_stack_motion (KzGesture *gesture,
52 @@ -1912,7 +1920,12 @@
53 }
55 static void
56 -cb_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
57 +cb_notebook_switch_page (GtkNotebook *notebook,
58 +#if GTK_CHECK_VERSION(2, 21, 6)
59 + gpointer page,
60 +#else
61 + GtkNotebookPage *page,
62 +#endif
63 guint page_num, KzWindow *kz)
64 {
65 KzWeb *kzweb = KZ_WINDOW_NTH_WEB(kz, page_num);
66 @@ -1971,7 +1984,12 @@
67 }
69 static void
70 -cb_notebook_switch_page_after (GtkNotebook *notebook, GtkNotebookPage *page,
71 +cb_notebook_switch_page_after (GtkNotebook *notebook,
72 +#if GTK_CHECK_VERSION(2, 21, 6)
73 + gpointer page,
74 +#else
75 + GtkNotebookPage *page,
76 +#endif
77 guint page_num, KzWindow *kz)
78 {
79 kz_feed_info_change_state(KZ_FEED_INFO(kz->feed_info));
80 --- kazehakase-0.5.8-svn3873_trunk/src/sidebar/kz-tabtree.c.gtk222 2009-10-16 23:53:09.000000000 +0900
81 +++ kazehakase-0.5.8-svn3873_trunk/src/sidebar/kz-tabtree.c 2010-09-08 23:36:25.000000000 +0900
82 @@ -85,7 +85,11 @@
84 /* signal handlers for Notebook on KzWindow */
85 static void cb_switch_page (GtkNotebook *notebook,
86 +#if GTK_CHECK_VERSION(2, 21, 6)
87 + gpointer page,
88 +#else
89 GtkNotebookPage *page,
90 +#endif
91 guint page_num,
92 KzTabTree *tabtree);
94 @@ -696,7 +700,12 @@
97 static void
98 -cb_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
99 +cb_switch_page (GtkNotebook *notebook,
100 +#if GTK_CHECK_VERSION(2, 21, 6)
101 + gpointer page,
102 +#else
103 + GtkNotebookPage *page,
104 +#endif
105 guint page_num, KzTabTree *tabtree)
106 {
107 KzWeb *web;