Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/ochusha/files: ochusha-0.5.8.2-type-punning.diff ochusha-0.5.8.2-glibc2.diff ochusha-0.5.8.2-gtk-2.12.diff
Date: Wed, 05 Mar 2008 17:04:17
Message-Id: E1JWx2B-0002bd-JW@stork.gentoo.org
1 matsuu 08/03/05 17:04:03
2
3 Added: ochusha-0.5.8.2-type-punning.diff
4 ochusha-0.5.8.2-glibc2.diff
5 ochusha-0.5.8.2-gtk-2.12.diff
6 Log:
7 Fixed to work with gtk+-2.12.1, bug #199495.
8 (Portage version: 2.1.4.4)
9
10 Revision Changes Path
11 1.1 www-client/ochusha/files/ochusha-0.5.8.2-type-punning.diff
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-type-punning.diff?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-type-punning.diff?rev=1.1&content-type=text/plain
15
16 Index: ochusha-0.5.8.2-type-punning.diff
17 ===================================================================
18 diff -Nru ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c
19 --- ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c 2008-03-02 07:26:57.000000000 +0000
20 +++ ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c 2008-03-02 10:59:48.000000000 +0000
21 @@ -2670,10 +2670,10 @@
22 ModNotebookPage *page = list->data;
23
24 if (page->last_focus_child)
25 - g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&page->last_focus_child);
26 + g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (void*)&page->last_focus_child);
27
28 page->last_focus_child = GTK_WINDOW (toplevel)->focus_widget;
29 - g_object_add_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&page->last_focus_child);
30 + g_object_add_weak_pointer (G_OBJECT (page->last_focus_child), (void*)&page->last_focus_child);
31
32 break;
33 }
34 @@ -2975,7 +2975,7 @@
35
36 if (page->last_focus_child)
37 {
38 - g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&page->last_focus_child);
39 + g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (void*)&page->last_focus_child);
40 page->last_focus_child = NULL;
41 }
42
43
44
45
46 1.1 www-client/ochusha/files/ochusha-0.5.8.2-glibc2.diff
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-glibc2.diff?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-glibc2.diff?rev=1.1&content-type=text/plain
50
51 Index: ochusha-0.5.8.2-glibc2.diff
52 ===================================================================
53 diff -Nru ochusha-0.5.8.2.orig/lib/utils.h ochusha-0.5.8.2/lib/utils.h
54 --- ochusha-0.5.8.2.orig/lib/utils.h 2008-03-02 07:26:56.000000000 +0000
55 +++ ochusha-0.5.8.2/lib/utils.h 2008-03-02 10:58:06.000000000 +0000
56 @@ -42,6 +42,8 @@
57 extern iconv_t utf8_to_native;
58 #endif
59
60 +char *strptime(const char *s, const char *format, struct tm *tm);
61 +
62 /*
63 * utility´Ø¿ô¤Ê¤É
64 */
65
66
67
68 1.1 www-client/ochusha/files/ochusha-0.5.8.2-gtk-2.12.diff
69
70 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-gtk-2.12.diff?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/ochusha/files/ochusha-0.5.8.2-gtk-2.12.diff?rev=1.1&content-type=text/plain
72
73 Index: ochusha-0.5.8.2-gtk-2.12.diff
74 ===================================================================
75 diff -Nru ochusha-0.5.8.2.orig/gtk2/bbs_thread_ui.c ochusha-0.5.8.2/gtk2/bbs_thread_ui.c
76 --- ochusha-0.5.8.2.orig/gtk2/bbs_thread_ui.c 2008-03-02 07:26:56.000000000 +0000
77 +++ ochusha-0.5.8.2/gtk2/bbs_thread_ui.c 2008-03-02 11:00:22.000000000 +0000
78 @@ -810,7 +810,11 @@
79 bold_tag = bbs_thread_view_get_tag_by_name(dummy_view, "bold");
80
81 /* ¼Î¤Æ */
82 +#if GTK_MINOR_VERSION <= 10
83 gtk_object_sink(GTK_OBJECT(dummy_view));
84 +#else
85 + g_object_ref_sink(GTK_OBJECT(dummy_view));
86 +#endif
87
88 {
89 #if 0
90 @@ -984,7 +988,11 @@
91 #endif
92 G_FREE(job_args);
93 G_FREE(job);
94 +#if GTK_MINOR_VERSION <= 10
95 gtk_object_sink(GTK_OBJECT(thread_view));
96 +#else
97 + g_object_ref_sink(GTK_OBJECT(thread_view));
98 +#endif
99
100 BBS_THREAD_UI_UNLOCK;
101 return NULL;
102 diff -Nru ochusha-0.5.8.2.orig/gtk2/boardlist_ui.c ochusha-0.5.8.2/gtk2/boardlist_ui.c
103 --- ochusha-0.5.8.2.orig/gtk2/boardlist_ui.c 2008-03-02 07:26:56.000000000 +0000
104 +++ ochusha-0.5.8.2/gtk2/boardlist_ui.c 2008-03-02 11:00:22.000000000 +0000
105 @@ -1351,7 +1351,11 @@
106
107 if (*item_view == NULL)
108 {
109 +#if GTK_MINOR_VERSION <= 10
110 gtk_object_sink(GTK_OBJECT(*tab_label));
111 +#else
112 + g_object_ref_sink(GTK_OBJECT(*tab_label));
113 +#endif
114 *tab_label = NULL;
115 return;
116 }
117 diff -Nru ochusha-0.5.8.2.orig/gtk2/download_ui.c ochusha-0.5.8.2/gtk2/download_ui.c
118 --- ochusha-0.5.8.2.orig/gtk2/download_ui.c 2008-03-02 07:26:57.000000000 +0000
119 +++ ochusha-0.5.8.2/gtk2/download_ui.c 2008-03-02 11:00:22.000000000 +0000
120 @@ -237,8 +237,12 @@
121 if (response_id == GTK_RESPONSE_OK)
122 {
123 GtkEntry *entry;
124 +#if GTK_MINOR_VERSION <= 10
125 filename
126 = gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget));
127 +#else
128 + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
129 +#endif
130 entry = (GtkEntry *)g_object_get_qdata(G_OBJECT(download_dialog),
131 filename_entry_id);
132 gtk_entry_set_text(entry, filename);
133 @@ -394,6 +398,7 @@
134 ? application->last_download_directory : g_get_home_dir());
135 }
136
137 +#if GTK_MINOR_VERSION <= 10
138 filesel_dialog = gtk_file_selection_new(_("Save Link As"));
139 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel_dialog),
140 pathname);
141 @@ -403,6 +408,22 @@
142 gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
143 GTK_RESPONSE_OK);
144 gtk_widget_show(filesel_dialog);
145 +#else
146 + filesel_dialog = gtk_file_chooser_dialog_new(_("Save Link As"), NULL,
147 + GTK_FILE_CHOOSER_ACTION_SAVE,
148 + GTK_STOCK_CANCEL,
149 + GTK_RESPONSE_CANCEL,
150 + GTK_STOCK_SAVE,
151 + GTK_RESPONSE_OK,
152 + NULL);
153 + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel_dialog), pathname);
154 + g_object_set_qdata(G_OBJECT(filesel_dialog), dialog_id, download_dialog);
155 + g_signal_connect(G_OBJECT(filesel_dialog), "response",
156 + G_CALLBACK(filesel_dialog_response_cb), application);
157 + gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
158 + GTK_RESPONSE_OK);
159 + gtk_dialog_run(GTK_DIALOG(filesel_dialog));
160 +#endif
161 }
162
163
164 diff -Nru ochusha-0.5.8.2.orig/gtk2/ochusha_ui.c ochusha-0.5.8.2/gtk2/ochusha_ui.c
165 --- ochusha-0.5.8.2.orig/gtk2/ochusha_ui.c 2008-03-02 07:26:57.000000000 +0000
166 +++ ochusha-0.5.8.2/gtk2/ochusha_ui.c 2008-03-02 11:00:22.000000000 +0000
167 @@ -1557,7 +1557,11 @@
168 = gtk_widget_render_icon(dummy, OCHUSHA_STOCK_NET_ERROR,
169 GTK_ICON_SIZE_MENU, "ochusha::net-error");
170
171 +#if GTK_MINOR_VERSION <= 10
172 gtk_object_sink(GTK_OBJECT(dummy));
173 +#else
174 + g_object_ref_sink(GTK_OBJECT(dummy));
175 +#endif
176
177 tab_label_id = g_quark_from_static_string("OchushaUI::icon-label");
178 tab_label_icon_counter_id
179 diff -Nru ochusha-0.5.8.2.orig/gtk2/paned_notebook.c ochusha-0.5.8.2/gtk2/paned_notebook.c
180 --- ochusha-0.5.8.2.orig/gtk2/paned_notebook.c 2008-03-02 07:26:56.000000000 +0000
181 +++ ochusha-0.5.8.2/gtk2/paned_notebook.c 2008-03-02 11:00:22.000000000 +0000
182 @@ -516,10 +516,15 @@
183
184 tool_button = gtk_tool_button_new(tmp_arrow, NULL);
185 GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
186 +#if GTK_MINOR_VERSION <= 10
187 gtk_tool_item_set_tooltip(tool_button,
188 paned_notebook->toolbar->tooltips,
189 _("Go to the Left Page"),
190 "go_left_page");
191 +#else
192 + gtk_tool_item_set_tooltip_text(tool_button,
193 + _("Go to the Left Page"));
194 +#endif
195 gtk_widget_show(GTK_WIDGET(tool_button));
196 g_signal_connect(G_OBJECT(tool_button), "clicked",
197 G_CALLBACK(go_left_button_cb), paned_notebook);
198 @@ -532,10 +537,15 @@
199 gtk_widget_show(tmp_arrow);
200 tool_button = gtk_tool_button_new(tmp_arrow, NULL);
201 GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
202 +#if GTK_MINOR_VERSION <= 10
203 gtk_tool_item_set_tooltip(tool_button,
204 paned_notebook->toolbar->tooltips,
205 _("Go to the Right Page"),
206 "go_right_page");
207 +#else
208 + gtk_tool_item_set_tooltip_text(tool_button,
209 + _("Go to the Right Page"));
210 +#endif
211 gtk_widget_show(GTK_WIDGET(tool_button));
212 g_signal_connect(G_OBJECT(tool_button), "clicked",
213 G_CALLBACK(go_right_button_cb), paned_notebook);
214 @@ -548,9 +558,14 @@
215 gtk_widget_show(GTK_WIDGET(paned_notebook->contents_menu));
216 gtk_container_add(GTK_CONTAINER(tmp_item),
217 GTK_WIDGET(paned_notebook->contents_menu));
218 +#if GTK_MINOR_VERSION <= 10
219 gtk_tool_item_set_tooltip(tmp_item, paned_notebook->toolbar->tooltips,
220 _("Select the Page to be Shown"),
221 "item_selection_menu");
222 +#else
223 + gtk_tool_item_set_tooltip_text(tmp_item,
224 + _("Select the Page to be Shown"));
225 +#endif
226 gtk_widget_show(GTK_WIDGET(tmp_item));
227 gtk_toolbar_insert(paned_notebook->toolbar, tmp_item, -1);
228 #endif
229 @@ -598,7 +613,11 @@
230 "destroy",
231 G_CALLBACK(gtk_widget_destroyed),
232 &paned_notebook->contents_pane);
233 +#if GTK_MINOR_VERSION <= 10
234 gtk_object_sink(GTK_OBJECT(paned_notebook->contents_pane));
235 +#else
236 + g_object_ref_sink(GTK_OBJECT(paned_notebook->contents_pane));
237 +#endif
238 }
239
240
241 diff -Nru ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c
242 --- ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c 2008-03-02 11:00:14.000000000 +0000
243 +++ ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c 2008-03-02 11:00:22.000000000 +0000
244 @@ -4943,7 +4943,11 @@
245 else
246 {
247 g_object_ref (page->menu_label);
248 +#if GTK_MINOR_VERSION <= 10
249 gtk_object_sink (GTK_OBJECT (page->menu_label));
250 +#else
251 + g_object_ref_sink(GTK_OBJECT (page->menu_label));
252 +#endif
253 }
254
255 if (notebook->menu)
256 @@ -5922,7 +5926,11 @@
257 {
258 page->menu_label = menu_label;
259 g_object_ref (page->menu_label);
260 +#if GTK_MINOR_VERSION <= 10
261 gtk_object_sink (GTK_OBJECT(page->menu_label));
262 +#else
263 + g_object_ref_sink(GTK_OBJECT(page->menu_label));
264 +#endif
265 page->default_menu = FALSE;
266 }
267 else
268
269
270
271 --
272 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups