Attachment #145075 for bug #199495

View | Details | Raw Unified | Return to bug 199495
Collapse All | Expand All

Lines 810-816 Link Here

(-)ochusha-0.5.8.2.orig/gtk2/bbs_thread_ui.c (+8 lines)
810	bold_tag = bbs_thread_view_get_tag_by_name(dummy_view, "bold");	810	bold_tag = bbs_thread_view_get_tag_by_name(dummy_view, "bold");
811		811
812	/* ¼Î¤Æ */	812	/* ¼Î¤Æ */
		813	#if GTK_MINOR_VERSION <= 10
813	gtk_object_sink(GTK_OBJECT(dummy_view));	814	gtk_object_sink(GTK_OBJECT(dummy_view));
		815	#else
		816	g_object_ref_sink(GTK_OBJECT(dummy_view));
		817	#endif
814		818
815	{	819	{
816	#if 0	820	#if 0
Lines 984-990 Link Here
984	#endif	988	#endif
985	G_FREE(job_args);	989	G_FREE(job_args);
986	G_FREE(job);	990	G_FREE(job);
		991	#if GTK_MINOR_VERSION <= 10
987	gtk_object_sink(GTK_OBJECT(thread_view));	992	gtk_object_sink(GTK_OBJECT(thread_view));
		993	#else
		994	g_object_ref_sink(GTK_OBJECT(thread_view));
		995	#endif
988		996
989	BBS_THREAD_UI_UNLOCK;	997	BBS_THREAD_UI_UNLOCK;
990	return NULL;	998	return NULL;

Lines 1351-1357 Link Here

(-)ochusha-0.5.8.2.orig/gtk2/boardlist_ui.c (+4 lines)
1351		1351
1352	if (*item_view == NULL)	1352	if (*item_view == NULL)
1353	{	1353	{
		1354	#if GTK_MINOR_VERSION <= 10
1354	gtk_object_sink(GTK_OBJECT(*tab_label));	1355	gtk_object_sink(GTK_OBJECT(*tab_label));
		1356	#else
		1357	g_object_ref_sink(GTK_OBJECT(*tab_label));
		1358	#endif
1355	*tab_label = NULL;	1359	*tab_label = NULL;
1356	return;	1360	return;
1357	}	1361	}

Lines 237-244 Link Here

(-)ochusha-0.5.8.2.orig/gtk2/download_ui.c (+21 lines)
237	if (response_id == GTK_RESPONSE_OK)	237	if (response_id == GTK_RESPONSE_OK)
238	{	238	{
239	GtkEntry *entry;	239	GtkEntry *entry;
		240	#if GTK_MINOR_VERSION <= 10
240	filename	241	filename
241	= gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget));	242	= gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget));
		243	#else
		244	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
		245	#endif
242	entry = (GtkEntry *)g_object_get_qdata(G_OBJECT(download_dialog),	246	entry = (GtkEntry *)g_object_get_qdata(G_OBJECT(download_dialog),
243	filename_entry_id);	247	filename_entry_id);
244	gtk_entry_set_text(entry, filename);	248	gtk_entry_set_text(entry, filename);
Lines 394-399 Link Here
394	? application->last_download_directory : g_get_home_dir());	398	? application->last_download_directory : g_get_home_dir());
395	}	399	}
396		400
		401	#if GTK_MINOR_VERSION <= 10
397	filesel_dialog = gtk_file_selection_new(_("Save Link As"));	402	filesel_dialog = gtk_file_selection_new(_("Save Link As"));
398	gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel_dialog),	403	gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel_dialog),
399	pathname);	404	pathname);
Lines 403-408 Link Here
403	gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),	408	gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
404	GTK_RESPONSE_OK);	409	GTK_RESPONSE_OK);
405	gtk_widget_show(filesel_dialog);	410	gtk_widget_show(filesel_dialog);
		411	#else
		412	filesel_dialog = gtk_file_chooser_dialog_new(_("Save Link As"), NULL,
		413	GTK_FILE_CHOOSER_ACTION_SAVE,
		414	GTK_STOCK_CANCEL,
		415	GTK_RESPONSE_CANCEL,
		416	GTK_STOCK_SAVE,
		417	GTK_RESPONSE_OK,
		418	NULL);
		419	gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel_dialog), pathname);
		420	g_object_set_qdata(G_OBJECT(filesel_dialog), dialog_id, download_dialog);
		421	g_signal_connect(G_OBJECT(filesel_dialog), "response",
		422	G_CALLBACK(filesel_dialog_response_cb), application);
		423	gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
		424	GTK_RESPONSE_OK);
		425	gtk_dialog_run(GTK_DIALOG(filesel_dialog));
		426	#endif
406	}	427	}
407		428
408		429

Lines 1557-1563 Link Here

(-)ochusha-0.5.8.2.orig/gtk2/ochusha_ui.c (+4 lines)
1557	= gtk_widget_render_icon(dummy, OCHUSHA_STOCK_NET_ERROR,	1557	= gtk_widget_render_icon(dummy, OCHUSHA_STOCK_NET_ERROR,
1558	GTK_ICON_SIZE_MENU, "ochusha::net-error");	1558	GTK_ICON_SIZE_MENU, "ochusha::net-error");
1559		1559
		1560	#if GTK_MINOR_VERSION <= 10
1560	gtk_object_sink(GTK_OBJECT(dummy));	1561	gtk_object_sink(GTK_OBJECT(dummy));
		1562	#else
		1563	g_object_ref_sink(GTK_OBJECT(dummy));
		1564	#endif
1561		1565
1562	tab_label_id = g_quark_from_static_string("OchushaUI::icon-label");	1566	tab_label_id = g_quark_from_static_string("OchushaUI::icon-label");
1563	tab_label_icon_counter_id	1567	tab_label_icon_counter_id

Lines 516-525 Link Here

(-)ochusha-0.5.8.2.orig/gtk2/paned_notebook.c (+19 lines)
516		516
517	tool_button = gtk_tool_button_new(tmp_arrow, NULL);	517	tool_button = gtk_tool_button_new(tmp_arrow, NULL);
518	GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);	518	GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
		519	#if GTK_MINOR_VERSION <= 10
519	gtk_tool_item_set_tooltip(tool_button,	520	gtk_tool_item_set_tooltip(tool_button,
520	paned_notebook->toolbar->tooltips,	521	paned_notebook->toolbar->tooltips,
521	_("Go to the Left Page"),	522	_("Go to the Left Page"),
522	"go_left_page");	523	"go_left_page");
		524	#else
		525	gtk_tool_item_set_tooltip_text(tool_button,
		526	_("Go to the Left Page"));
		527	#endif
523	gtk_widget_show(GTK_WIDGET(tool_button));	528	gtk_widget_show(GTK_WIDGET(tool_button));
524	g_signal_connect(G_OBJECT(tool_button), "clicked",	529	g_signal_connect(G_OBJECT(tool_button), "clicked",
525	G_CALLBACK(go_left_button_cb), paned_notebook);	530	G_CALLBACK(go_left_button_cb), paned_notebook);
Lines 532-541 Link Here
532	gtk_widget_show(tmp_arrow);	537	gtk_widget_show(tmp_arrow);
533	tool_button = gtk_tool_button_new(tmp_arrow, NULL);	538	tool_button = gtk_tool_button_new(tmp_arrow, NULL);
534	GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);	539	GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
		540	#if GTK_MINOR_VERSION <= 10
535	gtk_tool_item_set_tooltip(tool_button,	541	gtk_tool_item_set_tooltip(tool_button,
536	paned_notebook->toolbar->tooltips,	542	paned_notebook->toolbar->tooltips,
537	_("Go to the Right Page"),	543	_("Go to the Right Page"),
538	"go_right_page");	544	"go_right_page");
		545	#else
		546	gtk_tool_item_set_tooltip_text(tool_button,
		547	_("Go to the Right Page"));
		548	#endif
539	gtk_widget_show(GTK_WIDGET(tool_button));	549	gtk_widget_show(GTK_WIDGET(tool_button));
540	g_signal_connect(G_OBJECT(tool_button), "clicked",	550	g_signal_connect(G_OBJECT(tool_button), "clicked",
541	G_CALLBACK(go_right_button_cb), paned_notebook);	551	G_CALLBACK(go_right_button_cb), paned_notebook);
Lines 548-556 Link Here
548	gtk_widget_show(GTK_WIDGET(paned_notebook->contents_menu));	558	gtk_widget_show(GTK_WIDGET(paned_notebook->contents_menu));
549	gtk_container_add(GTK_CONTAINER(tmp_item),	559	gtk_container_add(GTK_CONTAINER(tmp_item),
550	GTK_WIDGET(paned_notebook->contents_menu));	560	GTK_WIDGET(paned_notebook->contents_menu));
		561	#if GTK_MINOR_VERSION <= 10
551	gtk_tool_item_set_tooltip(tmp_item, paned_notebook->toolbar->tooltips,	562	gtk_tool_item_set_tooltip(tmp_item, paned_notebook->toolbar->tooltips,
552	_("Select the Page to be Shown"),	563	_("Select the Page to be Shown"),
553	"item_selection_menu");	564	"item_selection_menu");
		565	#else
		566	gtk_tool_item_set_tooltip_text(tmp_item,
		567	_("Select the Page to be Shown"));
		568	#endif
554	gtk_widget_show(GTK_WIDGET(tmp_item));	569	gtk_widget_show(GTK_WIDGET(tmp_item));
555	gtk_toolbar_insert(paned_notebook->toolbar, tmp_item, -1);	570	gtk_toolbar_insert(paned_notebook->toolbar, tmp_item, -1);
556	#endif	571	#endif
Lines 598-604 Link Here
598	"destroy",	613	"destroy",
599	G_CALLBACK(gtk_widget_destroyed),	614	G_CALLBACK(gtk_widget_destroyed),
600	&paned_notebook->contents_pane);	615	&paned_notebook->contents_pane);
		616	#if GTK_MINOR_VERSION <= 10
601	gtk_object_sink(GTK_OBJECT(paned_notebook->contents_pane));	617	gtk_object_sink(GTK_OBJECT(paned_notebook->contents_pane));
		618	#else
		619	g_object_ref_sink(GTK_OBJECT(paned_notebook->contents_pane));
		620	#endif
602	}	621	}
603		622
604		623

Lines 4943-4949 Link Here

(-)ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c (+8 lines)
4943	else	4943	else
4944	{	4944	{
4945	g_object_ref (page->menu_label);	4945	g_object_ref (page->menu_label);
		4946	#if GTK_MINOR_VERSION <= 10
4946	gtk_object_sink (GTK_OBJECT (page->menu_label));	4947	gtk_object_sink (GTK_OBJECT (page->menu_label));
		4948	#else
		4949	g_object_ref_sink(GTK_OBJECT (page->menu_label));
		4950	#endif
4947	}	4951	}
4948		4952
4949	if (notebook->menu)	4953	if (notebook->menu)
Lines 5922-5928 Link Here
5922	{	5926	{
5923	page->menu_label = menu_label;	5927	page->menu_label = menu_label;
5924	g_object_ref (page->menu_label);	5928	g_object_ref (page->menu_label);
		5929	#if GTK_MINOR_VERSION <= 10
5925	gtk_object_sink (GTK_OBJECT(page->menu_label));	5930	gtk_object_sink (GTK_OBJECT(page->menu_label));
		5931	#else
		5932	g_object_ref_sink(GTK_OBJECT(page->menu_label));
		5933	#endif
5926	page->default_menu = FALSE;	5934	page->default_menu = FALSE;
5927	}	5935	}
5928	else	5936	else

Return to bug 199495