diff options
| -rw-r--r-- | applets/notify/mb-notification.c | 2 | ||||
| -rw-r--r-- | applets/showdesktop/showdesktop.c | 2 | ||||
| -rw-r--r-- | applets/systray/na-tray-manager.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | matchbox-panel/mb-panel-scaling-image.c | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/applets/notify/mb-notification.c b/applets/notify/mb-notification.c index bf0fc12..0d0e97c 100644 --- a/applets/notify/mb-notification.c +++ b/applets/notify/mb-notification.c @@ -34,7 +34,7 @@ on_button_release (MbNotification *notification, GdkEventButton *event) static gint expose (GtkWidget *widget, GdkEventExpose *event) { - if (GTK_WIDGET_DRAWABLE (widget)) { + if (gtk_widget_is_drawable (widget)) { gtk_paint_box (widget->style, widget->window, widget->state, GTK_SHADOW_OUT, &event->area, widget, "notification", diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c index 6ab9385..61dd5c2 100644 --- a/applets/showdesktop/showdesktop.c +++ b/applets/showdesktop/showdesktop.c @@ -199,7 +199,7 @@ mb_panel_applet_create (const char *id, gtk_button_set_relief (applet->button, GTK_RELIEF_NONE); - GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (button, FALSE); gtk_widget_set_name (button, "MatchboxPanelShowDesktop"); diff --git a/applets/systray/na-tray-manager.c b/applets/systray/na-tray-manager.c index 962d183..8eaaba1 100644 --- a/applets/systray/na-tray-manager.c +++ b/applets/systray/na-tray-manager.c @@ -604,7 +604,7 @@ na_tray_manager_unmanage (NaTrayManager *manager) invisible = manager->invisible; g_assert (GTK_IS_INVISIBLE (invisible)); - g_assert (GTK_WIDGET_REALIZED (invisible)); + g_assert (gtk_widget_get_realized (invisible)); g_assert (GDK_IS_WINDOW (invisible->window)); display = gtk_widget_get_display (invisible); diff --git a/configure.ac b/configure.ac index 4b56685..1cac4c4 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ GNOME_COMPILE_WARNINGS # base deps PKG_CHECK_MODULES(MATCHBOX_PANEL, glib-2.0 - gtk+-2.0 >= 2.6 + gtk+-2.0 >= 2.18 gmodule-export-2.0) # startup-notification diff --git a/matchbox-panel/mb-panel-scaling-image.c b/matchbox-panel/mb-panel-scaling-image.c index cbc2e3b..25aa041 100644 --- a/matchbox-panel/mb-panel-scaling-image.c +++ b/matchbox-panel/mb-panel-scaling-image.c @@ -1,4 +1,4 @@ -/* +/* * (C) 2006, 2007 OpenedHand Ltd. * * Author: Jorn Baayen <jorn@openedhand.com> @@ -301,7 +301,7 @@ static void icon_theme_changed_cb (GtkIconTheme *icon_theme, MBPanelScalingImage *image) { - if (!GTK_WIDGET_REALIZED (image)) + if (!gtk_widget_get_realized (GTK_WIDGET (image))) return; clear_cache (image); @@ -377,7 +377,7 @@ mb_panel_scaling_image_screen_changed (GtkWidget *widget, image); /* Reload icon if we are realized */ - if (GTK_WIDGET_REALIZED (widget)) { + if (gtk_widget_get_realized (widget)) { clear_cache (image); reload_icon (MB_PANEL_SCALING_IMAGE (widget), TRUE); @@ -483,7 +483,7 @@ mb_panel_scaling_image_set_icon (MBPanelScalingImage *image, if (icon) image->priv->icon = g_strdup (icon); - if (!GTK_WIDGET_REALIZED (image)) + if (!gtk_widget_get_realized (GTK_WIDGET (image))) return; if (image->priv->caching) { |