Conditionally remove some more deprecated functions.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15840 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome-utils/dialog-options.c

@@ -732,8 +732,12 @@ gnc_option_create_radiobutton_widget(char *name, GNCOption *option)
 
   /* Create the tooltips */
   tooltips = gtk_tooltips_new ();
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(tooltips);
+#else
   g_object_ref (tooltips);
   gtk_object_sink (GTK_OBJECT (tooltips));
+#endif
 
   /* Iterate over the options and create a radio button for each one */
   for (i = 0; i < num_values; i++)
@@ -1229,8 +1233,12 @@ gnc_options_dialog_build_contents(GNCOptionWin *propertybox,
   propertybox->tips = gtk_tooltips_new();
   propertybox->option_db = odb;
 
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(propertybox->tips);
+#else
   g_object_ref (propertybox->tips);
   gtk_object_sink (GTK_OBJECT (propertybox->tips));
+#endif
 
   num_sections = gnc_option_db_num_sections(odb);
   default_section_name = gnc_option_db_get_default_section(odb);

src/gnome-utils/dialog-preferences.c

@@ -515,7 +515,11 @@ gnc_preferences_build_page (gpointer data,
   gtk_container_foreach(GTK_CONTAINER(new_content), gnc_prefs_move_table_entry,
 			&copydata);
 
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(new_content);
+#else
   gtk_object_sink(GTK_OBJECT(new_content));
+#endif
   LEAVE("added content to page");
 }
 

src/gnome-utils/dialog-transfer.c

@@ -1653,8 +1653,12 @@ gnc_xfer_dialog_create(GtkWidget *parent, XferDialog *xferData)
 
   xferData->tips = gtk_tooltips_new();
 
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(xferData->tips);
+#else
   g_object_ref (xferData->tips);
   gtk_object_sink (GTK_OBJECT (xferData->tips));
+#endif
 
   /* default to quickfilling off of the "From" account. */
   xferData->quickfill = XFER_DIALOG_FROM;

src/gnome-utils/dialog-utils.c

@@ -99,8 +99,12 @@ gnc_build_option_menu(GNCOptionInfo *option_info, gint num_options)
 
   tooltips = gtk_tooltips_new();
 
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(tooltips);
+#else
   g_object_ref (tooltips);
   gtk_object_sink (GTK_OBJECT (tooltips));
+#endif
 
   for (i = 0; i < num_options; i++)
   {

src/gnome-utils/gnc-date-edit.c

@@ -713,7 +713,7 @@ create_children (GNCDateEdit *gde)
 	gtk_widget_show (GTK_WIDGET(frame));
 
 	gde->calendar = gtk_calendar_new ();
-	gtk_calendar_display_options
+	gtk_calendar_set_display_options
                 (GTK_CALENDAR (gde->calendar),
                  (GTK_CALENDAR_SHOW_DAY_NAMES
                   | GTK_CALENDAR_SHOW_HEADING

src/gnome-utils/gnc-html.c

@@ -1044,8 +1044,12 @@ gnc_html_new( GtkWindow *parent )
   //retval->http         = gnc_http_new();
   retval->history      = gnc_html_history_new();
 
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(retval->container);
+#else
   g_object_ref (retval->container);
   gtk_object_sink (GTK_OBJECT (retval->container));
+#endif
 
   /* signals */
   g_signal_connect(retval->html, "url_requested",

src/gnome-utils/gnc-tree-view.c

@@ -1363,8 +1363,12 @@ gnc_tree_view_create_menu_item (GtkTreeViewColumn *column,
   /* Create the menu if we don't have one already */
   if (!priv->column_menu) {
     priv->column_menu = gtk_menu_new();
+#ifdef HAVE_GTK_2_10
+    g_object_ref_sink(priv->column_menu);
+#else
     g_object_ref(priv->column_menu);
     gtk_object_sink(GTK_OBJECT(priv->column_menu));
+#endif
   }
 
   /* Create the check menu item */

src/gnome/dialog-sx-from-trans.c

@@ -363,9 +363,12 @@ sxftd_init( SXFromTransInfo *sxfti )
     w = GTK_WIDGET(glade_xml_get_widget( sxfti->gxml, SXFTD_EX_CAL_FRAME ));
     sxfti->dense_cal_model = gnc_dense_cal_store_new(num_marks);
     sxfti->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(sxfti->dense_cal_model)));
-    // gobject-2.10: g_object_ref_sink(sxfti->example_cal);
+#ifdef HAVE_GTK_2_10
+    g_object_ref_sink(sxfti->example_cal);
+#else
     g_object_ref(G_OBJECT(sxfti->example_cal));
     gtk_object_sink(GTK_OBJECT(sxfti->example_cal));
+#endif
 
     g_assert(sxfti->example_cal);
     gnc_dense_cal_set_num_months( sxfti->example_cal, SXFTD_EXCAL_NUM_MONTHS );

src/gnome/gnc-plugin-page-sx-list.c

@@ -343,9 +343,12 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page)
 
         priv->dense_cal_model = gnc_sx_instance_dense_cal_adapter_new(GNC_SX_INSTANCE_MODEL(priv->instances));
         priv->gdcal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(priv->dense_cal_model)));
-        // gobject-2.10: g_object_ref_sink(G_OBJECT(priv->gdcal));
+#ifdef HAVE_GTK_2_10
+        g_object_ref_sink(priv->gdcal);
+#else
         g_object_ref(G_OBJECT(priv->gdcal));
         gtk_object_sink(GTK_OBJECT(priv->gdcal));
+#endif
 
         gnc_dense_cal_set_months_per_col(priv->gdcal, 4);
         gnc_dense_cal_set_num_months(priv->gdcal, 12);

src/register/register-gnome/combocell-gnome.c

@@ -753,8 +753,12 @@ gnc_combo_cell_gui_realize (BasicCell *bcell, gpointer data)
 		box->item_list = gnc_item_edit_new_list(box->item_edit, cell->shared_store);
 	else
 		box->item_list = gnc_item_edit_new_list(box->item_edit, box->tmp_store);
+#ifdef HAVE_GTK_2_10
+        g_object_ref_sink(box->item_list);
+#else
 	g_object_ref (box->item_list);
 	gtk_object_sink (GTK_OBJECT(box->item_list));
+#endif
 
 	/* to mark cell as realized, remove the realize method */
 	cell->cell.gui_realize = NULL;

src/register/register-gnome/datecell-gnome.c

@@ -549,8 +549,12 @@ gnc_date_cell_realize (BasicCell *bcell, gpointer data)
   box->sheet = sheet;
   box->item_edit = item_edit;
   box->date_picker = gnc_item_edit_new_date_picker (box->item_edit);
+#ifdef HAVE_GTK_2_10
+  g_object_ref_sink(box->date_picker);
+#else
   g_object_ref (box->date_picker);
   gtk_object_sink (GTK_OBJECT(box->date_picker));
+#endif
 
   /* to mark cell as realized, remove the realize method */
   cell->cell.gui_realize = NULL;

src/register/register-gnome/gnucash-sheet.c

@@ -2408,8 +2408,12 @@ gnucash_sheet_new (Table *table)
 
         /* The entry widget */
         sheet->entry = gtk_entry_new ();
+#ifdef HAVE_GTK_2_10
+        g_object_ref_sink(sheet->entry);
+#else
         g_object_ref(sheet->entry);
         gtk_object_sink(GTK_OBJECT(sheet->entry));
+#endif
 	/*gtk_layout_put (GTK_LAYOUT (sheet), sheet->entry, 0, 0);*/
 
         /* set up the editor */