[murrine/gtk+3] Updates to the gtk+ 3.0 port

[Andrea Cimitan <acimitan src gnome org>]

commit 17ed4e459ba9d451d33f3d484587493fdfdda9d9
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Wed Oct 13 01:42:39 2010 +0200

    Updates to the gtk+ 3.0 port

 src/murrine_style.c |    4 ++--
 src/support.c       |   24 +++++++++---------------
 2 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/src/murrine_style.c b/src/murrine_style.c
index f1327d4..eb72ace 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -100,7 +100,7 @@ murrine_set_widget_parameters (const GtkWidget  *widget,
 	params->corners    = MRN_CORNER_ALL;
 	params->ltr        = murrine_widget_is_ltr ((GtkWidget*)widget);
 	params->focus      = (MURRINE_STYLE (style)->focusstyle != 0) && widget && gtk_widget_has_focus ((GtkWidget *) widget);
-	params->is_default = widget && GTK_WIDGET_HAS_DEFAULT ((GtkWidget *) widget);
+	params->is_default = widget && gtk_widget_has_default ((GtkWidget *) widget);
 
 	params->xthickness = style->xthickness;
 	params->ythickness = style->ythickness;
@@ -2131,7 +2131,7 @@ murrine_style_draw_focus (GtkStyle *style, cairo_t *cr, GtkStateType state_type,
 
 			if (relief == GTK_RELIEF_NORMAL)
 			{
-				if (widget && GTK_WIDGET_HAS_DEFAULT (widget))
+				if (widget && gtk_widget_has_default (widget))
 					focus.type = MRN_FOCUS_BUTTON_DEFAULT;
 				else
 					focus.type = MRN_FOCUS_BUTTON;
diff --git a/src/support.c b/src/support.c
index 50304a7..95850fe 100644
--- a/src/support.c
+++ b/src/support.c
@@ -245,7 +245,7 @@ murrine_get_notebook_tab_position (GtkWidget *widget,
 
 			/* Skip invisible tabs */
 			tab_label = gtk_notebook_get_tab_label (notebook, tab_child);
-			if (!tab_label || !GTK_WIDGET_VISIBLE (tab_label))
+			if (!tab_label || !gtk_widget_get_visible (tab_label))
 				continue;
 			/* This is the same what the notebook does internally. */
 			if (tab_label && !gtk_widget_get_child_visible (tab_label))
@@ -257,29 +257,23 @@ murrine_get_notebook_tab_position (GtkWidget *widget,
 				return;
 			}
 
-			gtk_notebook_query_tab_label_packing (notebook, tab_child,
-			                                      &expand,
-			                                      NULL, /* don't need fill */
-			                                      &pack_type);
+                        gtk_container_child_get (GTK_CONTAINER (notebook), tab_child,
+                                                 "tab-expand", &expand,
+                                                 "tab-pack", &pack_type,
+                                                 NULL);
 
-			if (!found_tabs)
-			{
+			if (!found_tabs) {
 				found_tabs = TRUE;
 				*start = FALSE;
 				*end = FALSE;
 			}
 
-			if (expand)
-			{
+			if (expand) {
 				*start = TRUE;
 				*end = TRUE;
-			}
-			else if (pack_type == GTK_PACK_START)
-			{
+			} else if (pack_type == GTK_PACK_START) {
 				*start = TRUE;
-			}
-			else
-			{
+			} else {
 				*end = TRUE;
 			}
 		}