[ekiga] Update to the new GTK 3.0 (remove GtkObject)

[Eugen Dedu <ededu src gnome org>]

commit fe4bf0ec5257a79e83e207734ebb947233793d35
Author: Marin Moulinier <marin star1 gmail com>
Date:   Tue Nov 16 19:34:02 2010 +0100

    Update to the new GTK 3.0 (remove GtkObject)
    
    Fixes bug #632046.

 lib/gui/gmdialog.c      |    2 +-
 src/gui/main_window.cpp |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/lib/gui/gmdialog.c b/lib/gui/gmdialog.c
index d34d4b5..4ef228c 100644
--- a/lib/gui/gmdialog.c
+++ b/lib/gui/gmdialog.c
@@ -417,7 +417,7 @@ gnomemeeting_dialog (GtkWindow *parent,
   
   g_signal_connect_swapped (dialog, "response",
                             G_CALLBACK (gtk_widget_destroy),
-                            GTK_OBJECT (dialog));
+                            dialog);
   
   /* Can be called from threads */
   gm_window_show (dialog);
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 15242a2..825629a 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -176,17 +176,29 @@ struct _EkigaMainWindowPrivate
   GtkWidget *audio_output_volume_frame;
   GtkWidget *input_signal;
   GtkWidget *output_signal;
+#if GTK_CHECK_VERSION (3, 0, 0)
+  GtkAdjustment *adj_input_volume;
+  GtkAdjustment *adj_output_volume;
+#else
   GtkObject *adj_input_volume;
   GtkObject *adj_output_volume;
+#endif
   unsigned int levelmeter_timeout_id;
 
   /* Video Settings Window */
   GtkWidget *video_settings_window;
   GtkWidget *video_settings_frame;
+#if GTK_CHECK_VERSION (3, 0, 0)
+  GtkWidget *adj_whiteness;
+  GtkAdjustment *adj_brightness;
+  GtkAdjustment *adj_colour;
+  GtkAdjustment *adj_contrast;
+#else
   GtkObject *adj_whiteness;
   GtkObject *adj_brightness;
   GtkObject *adj_colour;
   GtkObject *adj_contrast;
+#endif
 
   /* Misc Dialogs */
   GtkWidget *transfer_call_popup;
@@ -912,7 +924,7 @@ static bool on_handle_errors (std::string error,
 
   g_signal_connect_swapped (dialog, "response",
                             G_CALLBACK (gtk_widget_destroy),
-                            GTK_OBJECT (dialog));
+                            dialog);
 
   gtk_widget_show_all (dialog);
 
@@ -1672,7 +1684,7 @@ gm_mw_video_settings_window_new (EkigaMainWindow *mw)
   gtk_widget_set_sensitive (GTK_WIDGET (mw->priv->video_settings_frame), FALSE);
   
   /* That's an usual GtkWindow, connect it to the signals */
-  g_signal_connect_swapped (GTK_OBJECT (window), 
+  g_signal_connect_swapped (window, 
 			    "response", 
 			    G_CALLBACK (gm_window_hide),
 			    (gpointer) window);