[patch] Patch for gtk+ 2.12

ochusha-0.5.8.2-gtk-2.12.diff (text/plain), 6.69 KB, created by Anthony Low on 2008-03-02 11:09:21 UTC

diff -Nru ochusha-0.5.8.2.orig/gtk2/bbs_thread_ui.c ochusha-0.5.8.2/gtk2/bbs_thread_ui.c
--- ochusha-0.5.8.2.orig/gtk2/bbs_thread_ui.c	2008-03-02 07:26:56.000000000 +0000
+++ ochusha-0.5.8.2/gtk2/bbs_thread_ui.c	2008-03-02 11:00:22.000000000 +0000
@@ -810,7 +810,11 @@
   bold_tag = bbs_thread_view_get_tag_by_name(dummy_view, "bold");
 
   /* ¼Î¤Æ */
+#if GTK_MINOR_VERSION <= 10
   gtk_object_sink(GTK_OBJECT(dummy_view));
+#else
+  g_object_ref_sink(GTK_OBJECT(dummy_view));
+#endif
 
   {
 #if 0
@@ -984,7 +988,11 @@
 #endif
 	G_FREE(job_args);
 	G_FREE(job);
+#if GTK_MINOR_VERSION <= 10
 	gtk_object_sink(GTK_OBJECT(thread_view));
+#else
+	g_object_ref_sink(GTK_OBJECT(thread_view));
+#endif
 
 	BBS_THREAD_UI_UNLOCK;
 	return NULL;
diff -Nru ochusha-0.5.8.2.orig/gtk2/boardlist_ui.c ochusha-0.5.8.2/gtk2/boardlist_ui.c
--- ochusha-0.5.8.2.orig/gtk2/boardlist_ui.c	2008-03-02 07:26:56.000000000 +0000
+++ ochusha-0.5.8.2/gtk2/boardlist_ui.c	2008-03-02 11:00:22.000000000 +0000
@@ -1351,7 +1351,11 @@
 
   if (*item_view == NULL)
     {
+#if GTK_MINOR_VERSION <= 10
       gtk_object_sink(GTK_OBJECT(*tab_label));
+#else
+      g_object_ref_sink(GTK_OBJECT(*tab_label));
+#endif
       *tab_label = NULL;
       return;
     }
diff -Nru ochusha-0.5.8.2.orig/gtk2/download_ui.c ochusha-0.5.8.2/gtk2/download_ui.c
--- ochusha-0.5.8.2.orig/gtk2/download_ui.c	2008-03-02 07:26:57.000000000 +0000
+++ ochusha-0.5.8.2/gtk2/download_ui.c	2008-03-02 11:00:22.000000000 +0000
@@ -237,8 +237,12 @@
       if (response_id == GTK_RESPONSE_OK)
 	{
 	  GtkEntry *entry;
+#if GTK_MINOR_VERSION <= 10
 	  filename
 	    = gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget));
+#else
+	  filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+#endif
 	  entry = (GtkEntry *)g_object_get_qdata(G_OBJECT(download_dialog),
 						 filename_entry_id);
 	  gtk_entry_set_text(entry, filename);
@@ -394,6 +398,7 @@
 	       ? application->last_download_directory : g_get_home_dir());
     }
 
+#if GTK_MINOR_VERSION <= 10
   filesel_dialog = gtk_file_selection_new(_("Save Link As"));
   gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel_dialog),
 				  pathname);
@@ -403,6 +408,22 @@
   gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
 				  GTK_RESPONSE_OK);
   gtk_widget_show(filesel_dialog);
+#else
+  filesel_dialog = gtk_file_chooser_dialog_new(_("Save Link As"), NULL,
+  					       GTK_FILE_CHOOSER_ACTION_SAVE,
+					       GTK_STOCK_CANCEL,
+					       GTK_RESPONSE_CANCEL,
+					       GTK_STOCK_SAVE,
+					       GTK_RESPONSE_OK,
+					       NULL);
+  gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel_dialog), pathname);
+  g_object_set_qdata(G_OBJECT(filesel_dialog), dialog_id, download_dialog);
+  g_signal_connect(G_OBJECT(filesel_dialog), "response",
+                   G_CALLBACK(filesel_dialog_response_cb), application);
+  gtk_dialog_set_default_response(GTK_DIALOG(filesel_dialog),
+                                  GTK_RESPONSE_OK);
+  gtk_dialog_run(GTK_DIALOG(filesel_dialog));
+#endif
 }
 
 
diff -Nru ochusha-0.5.8.2.orig/gtk2/ochusha_ui.c ochusha-0.5.8.2/gtk2/ochusha_ui.c
--- ochusha-0.5.8.2.orig/gtk2/ochusha_ui.c	2008-03-02 07:26:57.000000000 +0000
+++ ochusha-0.5.8.2/gtk2/ochusha_ui.c	2008-03-02 11:00:22.000000000 +0000
@@ -1557,7 +1557,11 @@
     = gtk_widget_render_icon(dummy, OCHUSHA_STOCK_NET_ERROR,
 			     GTK_ICON_SIZE_MENU, "ochusha::net-error");
 
+#if GTK_MINOR_VERSION <= 10
   gtk_object_sink(GTK_OBJECT(dummy));
+#else
+  g_object_ref_sink(GTK_OBJECT(dummy));
+#endif
 
   tab_label_id = g_quark_from_static_string("OchushaUI::icon-label");
   tab_label_icon_counter_id
diff -Nru ochusha-0.5.8.2.orig/gtk2/paned_notebook.c ochusha-0.5.8.2/gtk2/paned_notebook.c
--- ochusha-0.5.8.2.orig/gtk2/paned_notebook.c	2008-03-02 07:26:56.000000000 +0000
+++ ochusha-0.5.8.2/gtk2/paned_notebook.c	2008-03-02 11:00:22.000000000 +0000
@@ -516,10 +516,15 @@
 
   tool_button = gtk_tool_button_new(tmp_arrow, NULL);
   GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
+#if GTK_MINOR_VERSION <= 10
   gtk_tool_item_set_tooltip(tool_button,
 			    paned_notebook->toolbar->tooltips,
 			    _("Go to the Left Page"),
 			    "go_left_page");
+#else
+  gtk_tool_item_set_tooltip_text(tool_button,
+                           _("Go to the Left Page"));
+#endif
   gtk_widget_show(GTK_WIDGET(tool_button));
   g_signal_connect(G_OBJECT(tool_button), "clicked",
 		   G_CALLBACK(go_left_button_cb), paned_notebook);
@@ -532,10 +537,15 @@
   gtk_widget_show(tmp_arrow);
   tool_button = gtk_tool_button_new(tmp_arrow, NULL);
   GTK_WIDGET_UNSET_FLAGS(tool_button, GTK_CAN_FOCUS);
+#if GTK_MINOR_VERSION <= 10
   gtk_tool_item_set_tooltip(tool_button,
 			    paned_notebook->toolbar->tooltips,
 			    _("Go to the Right Page"),
 			    "go_right_page");
+#else
+  gtk_tool_item_set_tooltip_text(tool_button,
+                           _("Go to the Right Page"));
+#endif
   gtk_widget_show(GTK_WIDGET(tool_button));
   g_signal_connect(G_OBJECT(tool_button), "clicked",
 		   G_CALLBACK(go_right_button_cb), paned_notebook);
@@ -548,9 +558,14 @@
   gtk_widget_show(GTK_WIDGET(paned_notebook->contents_menu));
   gtk_container_add(GTK_CONTAINER(tmp_item),
 		    GTK_WIDGET(paned_notebook->contents_menu));
+#if GTK_MINOR_VERSION <= 10
   gtk_tool_item_set_tooltip(tmp_item, paned_notebook->toolbar->tooltips,
 			    _("Select the Page to be Shown"),
 			    "item_selection_menu");
+#else
+  gtk_tool_item_set_tooltip_text(tmp_item,
+                           _("Select the Page to be Shown"));
+#endif
   gtk_widget_show(GTK_WIDGET(tmp_item));
   gtk_toolbar_insert(paned_notebook->toolbar, tmp_item, -1);
 #endif
@@ -598,7 +613,11 @@
 		   "destroy",
 		   G_CALLBACK(gtk_widget_destroyed),
 		   &paned_notebook->contents_pane);
+#if GTK_MINOR_VERSION <= 10
   gtk_object_sink(GTK_OBJECT(paned_notebook->contents_pane));
+#else
+  g_object_ref_sink(GTK_OBJECT(paned_notebook->contents_pane));
+#endif
 }
 
 
diff -Nru ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c
--- ochusha-0.5.8.2.orig/libmodifiedgtk2/mod_notebook.c	2008-03-02 11:00:14.000000000 +0000
+++ ochusha-0.5.8.2/libmodifiedgtk2/mod_notebook.c	2008-03-02 11:00:22.000000000 +0000
@@ -4943,7 +4943,11 @@
   else  
     {
       g_object_ref (page->menu_label);
+#if GTK_MINOR_VERSION <= 10
       gtk_object_sink (GTK_OBJECT (page->menu_label));
+#else
+      g_object_ref_sink(GTK_OBJECT (page->menu_label));
+#endif
     }
 
   if (notebook->menu)
@@ -5922,7 +5926,11 @@
     {
       page->menu_label = menu_label;
       g_object_ref (page->menu_label);
+#if GTK_MINOR_VERSION <= 10
       gtk_object_sink (GTK_OBJECT(page->menu_label));
+#else
+      g_object_ref_sink(GTK_OBJECT(page->menu_label));
+#endif
       page->default_menu = FALSE;
     }
   else