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