[ekiga] Replace deprecated functions in gtk >= 2.18



commit 6716e1a56ed37e5636e07ecdac33ac24a5eecfdf
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Jun 2 18:45:25 2010 +0200

    Replace deprecated functions in gtk >= 2.18

 lib/gui/gmlevelmeter.c  |   12 ++++++------
 src/gui/main_window.cpp |    6 +++---
 src/gui/statusicon.cpp  |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/lib/gui/gmlevelmeter.c b/lib/gui/gmlevelmeter.c
index 309d8d2..709348a 100644
--- a/lib/gui/gmlevelmeter.c
+++ b/lib/gui/gmlevelmeter.c
@@ -153,7 +153,7 @@ gm_level_meter_set_level (GmLevelMeter *lm,
   if (level > lm->peak)
     lm->peak = level;
 
-  if (GTK_WIDGET_REALIZED (lm))
+  if (gtk_widget_get_realized (GTK_WIDGET (lm)))
     gm_level_meter_paint (lm);
 }
 
@@ -164,7 +164,7 @@ gm_level_meter_clear (GmLevelMeter *lm)
   lm->level = 0;
   lm->peak = 0;
 
-  if (GTK_WIDGET_REALIZED (lm))
+  if (gtk_widget_get_realized (GTK_WIDGET (lm)))
     gm_level_meter_paint (lm);
 }
 
@@ -178,7 +178,7 @@ gm_level_meter_set_colors (GmLevelMeter* lm,
   if (lm->colorEntries) {
 
     /* free old colors, if they have been allocated; delete old array */
-    if (GTK_WIDGET_REALIZED (lm)) 
+    if (gtk_widget_get_realized (GTK_WIDGET (lm)))
       gm_level_meter_free_colors (lm->colorEntries);
     g_array_free (lm->colorEntries, TRUE);
   }
@@ -193,7 +193,7 @@ gm_level_meter_set_colors (GmLevelMeter* lm,
     g_array_append_val (lm->colorEntries, *entry);
   }
 
-  if (GTK_WIDGET_REALIZED (lm)) {
+  if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
 
     gm_level_meter_allocate_colors (lm->colorEntries);
 
@@ -381,7 +381,7 @@ gm_level_meter_create_pixmap (GmLevelMeter *lm)
 
   g_return_if_fail (GM_IS_LEVEL_METER (lm));
 
-  if (GTK_WIDGET_REALIZED (lm)) {
+  if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
 
     GtkAllocation allocation;
 
@@ -579,7 +579,7 @@ gm_level_meter_size_allocate (GtkWidget *widget,
   g_return_if_fail (allocation != NULL);
 
   gtk_widget_set_allocation (widget, allocation);
-  if (GTK_WIDGET_REALIZED (widget)) {
+  if (gtk_widget_get_realized (widget)) {
 
     gdk_window_move_resize (gtk_widget_get_window (widget),
                             allocation->x, allocation->y,
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index f0d3449..04faf4f 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1035,7 +1035,7 @@ ekiga_main_window_set_video_size (EkigaMainWindow *mw, int width, int height)
     return;
 
   panel = gtk_paned_get_child2 (GTK_PANED (mw->priv->hpaned));
-  if (GTK_WIDGET_VISIBLE (panel)) {
+  if (gtk_widget_get_visible (panel)) {
     int x, y;
     int rw, pos;
     GtkRequisition req;
@@ -2571,7 +2571,7 @@ ekiga_main_window_show_call_panel (EkigaMainWindow *mw)
   int x, y = 0;
   GtkWidget *call_panel = gtk_paned_get_child2 (GTK_PANED (mw->priv->hpaned));
 
-  if (!GTK_WIDGET_VISIBLE (call_panel)) {
+  if (!gtk_widget_get_visible (call_panel)) {
     gtk_window_get_size (GTK_WINDOW (mw), &x, &y);
     gtk_widget_show_all (call_panel);
     gtk_window_resize (GTK_WINDOW (mw), x + call_panel->allocation.width, y);
@@ -2585,7 +2585,7 @@ ekiga_main_window_hide_call_panel (EkigaMainWindow *mw)
   int x, y = 0;
   GtkWidget *call_panel = gtk_paned_get_child2 (GTK_PANED (mw->priv->hpaned));
 
-  if (GTK_WIDGET_VISIBLE (call_panel)) {
+  if (gtk_widget_get_visible (call_panel)) {
     gtk_window_get_size (GTK_WINDOW (mw), &x, &y);
     gtk_widget_hide (call_panel);
     x = x - call_panel->allocation.width;
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 513d0d1..5b605fd 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -271,7 +271,7 @@ statusicon_activated_cb (G_GNUC_UNUSED GtkStatusIcon *icon,
     window = GnomeMeeting::Process ()->GetMainWindow (); //FIXME
 
     // FIXME when the main window becomes a gobject
-    if (!(GTK_WIDGET_VISIBLE (window) 
+    if (!(gtk_widget_get_visible (window)
           && !(gdk_window_get_state (GDK_WINDOW (window->window)) & GDK_WINDOW_STATE_ICONIFIED))) {
       gtk_widget_show (window);
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]