gtk+ r21813 - branches/gtk-2-14/modules/other/gail

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Nov 28 04:05:27 2008
New Revision: 21813
URL: http://svn.gnome.org/viewvc/gtk+?rev=21813&view=rev

Log:
2008-11-27  Matthias Clasen  <mclasen redhat com>

        Bug 353088 â gtk_expander_get_label should return the full label text

        * gailexpander.c: Don't rely on gtk_expander_get_label.
        Patch by Peter Johanson.




Modified:
   branches/gtk-2-14/modules/other/gail/ChangeLog
   branches/gtk-2-14/modules/other/gail/gailexpander.c

Modified: branches/gtk-2-14/modules/other/gail/gailexpander.c
==============================================================================
--- branches/gtk-2-14/modules/other/gail/gailexpander.c	(original)
+++ branches/gtk-2-14/modules/other/gail/gailexpander.c	Fri Nov 28 04:05:27 2008
@@ -45,6 +45,7 @@
 static void                  gail_expander_finalize         (GObject           *object);
 static void                  gail_expander_init_textutil    (GailExpander      *expander,
                                                              GtkExpander       *widget);
+static G_CONST_RETURN gchar* gail_expander_get_full_text    (GtkExpander       *widget);
 
 static void                  atk_action_interface_init  (AtkActionIface *iface);
 static gboolean              gail_expander_do_action    (AtkAction      *action,
@@ -169,7 +170,7 @@
 
       g_return_val_if_fail (GTK_IS_EXPANDER (widget), NULL);
 
-      return gtk_expander_get_label (GTK_EXPANDER (widget)); 
+      return gail_expander_get_full_text (GTK_EXPANDER (widget));
     }
 }
 
@@ -293,7 +294,7 @@
       const gchar* label_text;
 
 
-      label_text = gtk_expander_get_label (expander);
+      label_text = gail_expander_get_full_text (expander);
 
       gail_expander = GAIL_EXPANDER (atk_obj);
       if (gail_expander->textutil)
@@ -323,6 +324,19 @@
     GAIL_WIDGET_CLASS (gail_expander_parent_class)->notify_gtk (obj, pspec);
 }
 
+static G_CONST_RETURN gchar*
+gail_expander_get_full_text (GtkExpander *widget)
+{
+  GtkWidget *label_widget;
+
+  label_widget = gtk_expander_get_label_widget (widget);
+
+  if (!GTK_IS_LABEL (label_widget))
+    return NULL;
+
+  return gtk_label_get_text (GTK_LABEL (label_widget));
+}
+
 static void
 gail_expander_init_textutil (GailExpander *expander,
                              GtkExpander  *widget)
@@ -330,7 +344,7 @@
   const gchar *label_text;
 
   expander->textutil = gail_text_util_new ();
-  label_text = gtk_expander_get_label (widget);
+  label_text = gail_expander_get_full_text (widget);
   gail_text_util_text_setup (expander->textutil, label_text);
 }
 
@@ -578,7 +592,7 @@
   if (!expander->textutil) 
     gail_expander_init_textutil (expander, GTK_EXPANDER (widget));
 
-  label_text = gtk_expander_get_label (GTK_EXPANDER (widget));
+  label_text = gail_expander_get_full_text (GTK_EXPANDER (widget));
 
   if (label_text == NULL)
     return NULL;