[ekiga] GTK: Backport of interesting ds-gtk3 changes.

[Damien Sandras <dsandras src gnome org>]

commit b142c2a741c60ec2e6ff178348f2e2ef3c6a9cf6
Author: Damien Sandras <dsandras beip be>
Date:   Sun Oct 28 15:57:16 2012 +0100

    GTK: Backport of interesting ds-gtk3 changes.

 lib/engine/gui/gtk-core/form-dialog-gtk.cpp     |    2 +-
 lib/engine/gui/gtk-frontend/book-view-gtk.cpp   |   14 --------------
 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp |    2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
index d1ef11e..5eef378 100644
--- a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
+++ b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
@@ -647,7 +647,7 @@ FormDialog::FormDialog (Ekiga::FormRequestPtr _request,
 
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
   preamble = gtk_vbox_new (FALSE, 0);
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index a573bba..bf7ad79 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -241,9 +241,6 @@ on_updated (gpointer data)
   gtk_statusbar_pop (GTK_STATUSBAR (view->priv->statusbar), 0);
   gtk_statusbar_push (GTK_STATUSBAR (view->priv->statusbar), 0, status.c_str ());
 
-  if (GDK_IS_WINDOW (GTK_WIDGET (view)->window))
-    gdk_window_set_cursor (GTK_WIDGET (view)->window, NULL);
-
   boost::shared_ptr<Ekiga::Filterable> filtered = boost::dynamic_pointer_cast<Ekiga::Filterable>(view->priv->book);
   if (filtered) {
 
@@ -277,13 +274,8 @@ static void
 on_entry_activated_cb (GtkWidget *entry,
                        gpointer data)
 {
-  GdkCursor *cursor = NULL;
   const char *entry_text = gtk_entry_get_text (GTK_ENTRY (entry));
 
-  cursor = gdk_cursor_new (GDK_WATCH);
-  gdk_window_set_cursor (GTK_WIDGET (data)->window, cursor);
-  gdk_cursor_unref (cursor);
-
   boost::shared_ptr<Ekiga::Filterable> filtered = boost::dynamic_pointer_cast<Ekiga::Filterable>(BOOK_VIEW_GTK (data)->priv->book);
 
   filtered->set_search_filter (entry_text);
@@ -400,9 +392,6 @@ book_view_gtk_update_contact (BookViewGtk *self,
 		      -1);
   if (pixbuf)
     g_object_unref (pixbuf);
-
-  if (GDK_IS_WINDOW (GTK_WIDGET (self)->window))
-    gdk_window_set_cursor (GTK_WIDGET (self)->window, NULL);
 }
 
 
@@ -419,9 +408,6 @@ book_view_gtk_remove_contact (BookViewGtk *self,
 
   while (book_view_gtk_find_iter_for_contact (self, contact, &iter))
     gtk_list_store_remove (store, &iter);
-
-  if (GDK_IS_WINDOW (GTK_WIDGET (self)->window))
-    gdk_window_set_cursor (GTK_WIDGET (self)->window, NULL);
 }
 
 
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index b77f190..2a96d70 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -885,7 +885,7 @@ expand_cell_data_func (GtkTreeViewColumn *column,
   gboolean row_expanded = FALSE;
 
   path = gtk_tree_model_get_path (model, iter);
-  row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (column->tree_view), path);
+  row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (gtk_tree_view_column_get_tree_view (column)), path);
   gtk_tree_path_free (path);
 
   gtk_tree_model_get (model, iter, COLUMN_TYPE, &column_type, -1);