[gnome-mud] gtk3 porting: Use gtk_widget_get_mapped and _get_visible instead of GTK_WIDGET_MAPPED/VISIBLE

[Mart Raudsepp <mraudsepp src gnome org>]

commit e19a07c0ceec8bd8d987801f42244ffa102aea4b
Author: Mart Raudsepp <leio gentoo org>
Date:   Mon Jan 2 03:04:53 2012 +0200

    gtk3 porting: Use gtk_widget_get_mapped and _get_visible instead of GTK_WIDGET_MAPPED/VISIBLE

 src/mud-subwindow.c |   12 ++++++------
 src/mud-window.c    |   14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/mud-subwindow.c b/src/mud-subwindow.c
index 4c050e5..04287e6 100644
--- a/src/mud-subwindow.c
+++ b/src/mud-subwindow.c
@@ -839,7 +839,7 @@ mud_subwindow_set_size_force_grid (MudSubwindow *window,
     w += xpad * 2 + char_width * grid_width;
     h += ypad * 2 + char_height * grid_height;
 
-    if (even_if_mapped && GTK_WIDGET_MAPPED (app)) {
+    if (even_if_mapped && gtk_widget_get_mapped (app)) {
         gtk_window_resize (GTK_WINDOW (app), w, h);
     }
 }
@@ -853,7 +853,7 @@ mud_subwindow_update_geometry (MudSubwindow *window)
     gint char_height;
     gint xpad, ypad;
 
-    if(GTK_WIDGET_MAPPED(window->priv->window))
+    if(gtk_widget_get_mapped(window->priv->window))
     {
         char_width = VTE_TERMINAL(widget)->char_width;
         char_height = VTE_TERMINAL(widget)->char_height;
@@ -911,7 +911,7 @@ mud_subwindow_configure_event_cb(GtkWidget *widget,
 {
     MudSubwindow *self = MUD_SUBWINDOW(user_data);
 
-    if(GTK_WIDGET_MAPPED(self->priv->entry))
+    if(gtk_widget_get_mapped(self->priv->entry))
         gtk_widget_grab_focus(self->priv->entry);
 
     return FALSE;
@@ -922,7 +922,7 @@ mud_subwindow_size_allocate_cb(GtkWidget *widget,
                                GtkAllocation *allocation,
                                MudSubwindow *self)
 {
-    if(GTK_WIDGET_MAPPED(self->priv->window))
+    if(gtk_widget_get_mapped(self->priv->window))
     {
         if(self->priv->width != allocation->width ||
                 self->priv->height != allocation->height)
@@ -946,7 +946,7 @@ mud_subwindow_focus_in_cb(GtkWidget *widget,
 {
     MudSubwindow *self = MUD_SUBWINDOW(user_data);
 
-    if(GTK_WIDGET_MAPPED(self->priv->entry))
+    if(gtk_widget_get_mapped(self->priv->entry))
         gtk_widget_grab_focus(self->priv->entry);
 
     return TRUE;
@@ -962,7 +962,7 @@ mud_subwindow_entry_keypress_cb(GtkWidget *widget,
 
     if ((event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) &&
         (event->state & gtk_accelerator_get_default_mod_mask()) == 0   &&
-         GTK_WIDGET_MAPPED(self->priv->entry) )
+         gtk_widget_get_mapped(self->priv->entry) )
     {
         gchar *head = g_queue_peek_head(self->priv->history);
         const gchar *text = gtk_entry_get_text(GTK_ENTRY(self->priv->entry));
diff --git a/src/mud-window.c b/src/mud-window.c
index 3841a8e..ec9d898 100644
--- a/src/mud-window.c
+++ b/src/mud-window.c
@@ -394,7 +394,7 @@ mud_window_init (MudWindow *self)
             GTK_SCROLLED_WINDOW(self->priv->textviewscroll)->vscrollbar,
             -1, 1);
 
-    if (GTK_WIDGET_VISIBLE(self->priv->textviewscroll))
+    if (gtk_widget_get_visible(self->priv->textviewscroll))
         gtk_widget_queue_resize(self->priv->textviewscroll);
 
     gtk_window_get_size(GTK_WINDOW(self->window),
@@ -553,7 +553,7 @@ mud_window_grab_entry_focus_cb(GtkWidget *widget,
 {
     MudWindow *self = MUD_WINDOW(user_data);
 
-    if(GTK_WIDGET_VISIBLE(self->priv->textview))
+    if(gtk_widget_get_visible(self->priv->textview))
         gtk_widget_grab_focus(self->priv->textview);
     else
         gtk_widget_grab_focus(self->priv->password_entry);
@@ -758,7 +758,7 @@ mud_window_notebook_page_change(GtkNotebook *notebook, gpointer page, gint arg,
 
         mud_window_toggle_input_mode(self, self->priv->current_view);
 
-        if(GTK_WIDGET_VISIBLE(self->priv->textview))
+        if(gtk_widget_get_visible(self->priv->textview))
             gtk_widget_grab_focus(self->priv->textview);
         else
             gtk_widget_grab_focus(self->priv->password_entry);
@@ -895,7 +895,7 @@ mud_window_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer
         g_object_unref(buf);
     }
 
-    if(GTK_WIDGET_VISIBLE(self->priv->textview))
+    if(gtk_widget_get_visible(self->priv->textview))
         gtk_widget_grab_focus(self->priv->textview);
     else
         gtk_widget_grab_focus(self->priv->password_entry);
@@ -908,7 +908,7 @@ mud_window_size_allocate_cb(GtkWidget *widget,
                             GtkAllocation *allocation,
                             MudWindow *self)
 {
-    if(GTK_WIDGET_MAPPED(self->window))
+    if(gtk_widget_get_mapped(GTK_WIDGET(self->window)))
     {
         if(self->priv->width != allocation->width ||
            self->priv->height != allocation->height)
@@ -1133,7 +1133,7 @@ mud_window_toggle_input_mode(MudWindow *self,
 
         if(local_echo)
         {
-            if(GTK_WIDGET_MAPPED(self->priv->password_entry))
+            if(gtk_widget_get_mapped(self->priv->password_entry))
             {
                 gtk_widget_hide(self->priv->password_entry);
 
@@ -1368,7 +1368,7 @@ mud_window_disconnected(MudWindow *self)
     gtk_widget_set_sensitive(self->priv->menu_disconnect, FALSE);
     gtk_widget_set_sensitive(self->priv->toolbar_disconnect, FALSE);
 
-    if(GTK_WIDGET_VISIBLE(self->priv->password_entry))
+    if(gtk_widget_get_visible(self->priv->password_entry))
     {
         gtk_widget_hide(self->priv->password_entry);