[libwnck] [all] Build with latest GSeal'ed gtk+



commit 22b8951f7b19b31f8501cfeff1f53d94597aa995
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Mar 4 17:59:31 2010 +0100

    [all] Build with latest GSeal'ed gtk+
    
    This means we now require gtk+ 2.19.7.

 configure.in       |    2 +-
 libwnck/pager.c    |    2 +-
 libwnck/selector.c |   12 ++++++------
 libwnck/tasklist.c |    6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/configure.in b/configure.in
index 99eb3b7..b8c237c 100644
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,7 @@ AC_SUBST(XRES_PACKAGE)
 AC_SUBST(XLIB_CFLAGS)
 AC_SUBST(XLIB_LIBS)
 
-PKG_CHECK_MODULES(LIBWNCK, gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.16.0 gobject-2.0 >= 2.13.0 $STARTUP_NOTIFICATION_PACKAGE $XRES_PACKAGE)
+PKG_CHECK_MODULES(LIBWNCK, gtk+-2.0 >= 2.19.7 glib-2.0 >= 2.16.0 gobject-2.0 >= 2.13.0 $STARTUP_NOTIFICATION_PACKAGE $XRES_PACKAGE)
 AC_SUBST(LIBWNCK_LIBS)
 AC_SUBST(LIBWNCK_CFLAGS)
 
diff --git a/libwnck/pager.c b/libwnck/pager.c
index 2713ead..34e3974 100644
--- a/libwnck/pager.c
+++ b/libwnck/pager.c
@@ -1264,7 +1264,7 @@ wnck_pager_expose_event  (GtkWidget      *widget,
 			"focus-line-width", &focus_width,
 			NULL);
 
-  if (GTK_WIDGET_HAS_FOCUS (widget))
+  if (gtk_widget_has_focus (widget))
     gtk_paint_focus (widget->style,
 		     widget->window,
 		     GTK_WIDGET_STATE (widget),
diff --git a/libwnck/selector.c b/libwnck/selector.c
index 775c7f0..f154494 100644
--- a/libwnck/selector.c
+++ b/libwnck/selector.c
@@ -285,7 +285,7 @@ wnck_selector_make_menu_consistent (WnckSelector *selector)
           separator_is_last = TRUE;
           separator = GTK_WIDGET (l->data);
         }
-      else if (GTK_WIDGET_VISIBLE (l->data) &&
+      else if (gtk_widget_get_visible (l->data) &&
                l->data != selector->priv->no_windows_item)
         {
           separator_is_last = FALSE;
@@ -447,7 +447,7 @@ wnck_selector_window_workspace_changed (WnckWindow   *window,
 
   item = NULL;
 
-  if (!selector->priv->menu || !GTK_WIDGET_VISIBLE (selector->priv->menu))
+  if (!selector->priv->menu || !gtk_widget_get_visible (selector->priv->menu))
     return;
 
   if (!selector->priv->window_hash)
@@ -821,7 +821,7 @@ wnck_selector_window_opened (WnckScreen *screen,
 {
   wnck_selector_connect_to_window (selector, window);
 
-  if (!selector->priv->menu || !GTK_WIDGET_VISIBLE (selector->priv->menu))
+  if (!selector->priv->menu || !gtk_widget_get_visible (selector->priv->menu))
     return;
 
   if (!selector->priv->window_hash)
@@ -842,7 +842,7 @@ wnck_selector_window_closed (WnckScreen *screen,
   if (window == selector->priv->icon_window)
     wnck_selector_set_active_window (selector, NULL);
 
-  if (!selector->priv->menu || !GTK_WIDGET_VISIBLE (selector->priv->menu))
+  if (!selector->priv->menu || !gtk_widget_get_visible (selector->priv->menu))
     return;
 
   if (!selector->priv->window_hash)
@@ -865,7 +865,7 @@ wnck_selector_workspace_created (WnckScreen    *screen,
                                  WnckWorkspace *workspace,
                                  WnckSelector  *selector)
 {
-  if (!selector->priv->menu || !GTK_WIDGET_VISIBLE (selector->priv->menu))
+  if (!selector->priv->menu || !gtk_widget_get_visible (selector->priv->menu))
     return;
 
   /* this is assuming that the new workspace will have a higher number
@@ -888,7 +888,7 @@ wnck_selector_workspace_destroyed (WnckScreen    *screen,
   GtkWidget *destroy;
   int        i;
 
-  if (!selector->priv->menu || !GTK_WIDGET_VISIBLE (selector->priv->menu))
+  if (!selector->priv->menu || !gtk_widget_get_visible (selector->priv->menu))
     return;
 
   destroy = NULL;
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index cbf0c9a..a3bf584 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -1741,7 +1741,7 @@ wnck_tasklist_expose (GtkWidget      *widget,
   g_return_val_if_fail (WNCK_IS_TASKLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
   
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       tasklist = WNCK_TASKLIST (widget);
       /* get a screenshot of the background */
@@ -2260,7 +2260,7 @@ wnck_tasklist_update_lists (WnckTasklist *tasklist)
   wnck_tasklist_free_tasks (tasklist);
 
   /* wnck_tasklist_update_lists() will be called on realize */
-  if (!GTK_WIDGET_REALIZED (tasklist))
+  if (!gtk_widget_get_realized (GTK_WIDGET (tasklist)))
     return;
   
   if (GTK_WIDGET (tasklist)->window != NULL)
@@ -2446,7 +2446,7 @@ wnck_tasklist_update_icon_geometries (WnckTasklist *tasklist,
 	for (l1 = visible_tasks; l1; l1 = l1->next) {
 		WnckTask *task = WNCK_TASK (l1->data);
 		
-		if (!GTK_WIDGET_REALIZED (task->button))
+		if (!gtk_widget_get_realized (task->button))
 			continue;
 
 		gdk_window_get_origin (GTK_BUTTON (task->button)->event_window,



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