gtk+ r21546 - in trunk: . docs/reference docs/reference/gtk gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Sep 29 20:55:31 2008
New Revision: 21546
URL: http://svn.gnome.org/viewvc/gtk+?rev=21546&view=rev

Log:
2008-09-29  Matthias Clasen  <mclasen redhat com>

        * gtk/gtk.symbols:
        * gtk/gtkimmulticontext.[hc] (gtk_im_multicontext_get_context_id):
        Add a getter for the the sealed context_id field.



Modified:
   trunk/ChangeLog
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/gtk/gtk-sections.txt
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkimmulticontext.c
   trunk/gtk/gtkimmulticontext.h

Modified: trunk/docs/reference/gtk/gtk-sections.txt
==============================================================================
--- trunk/docs/reference/gtk/gtk-sections.txt	(original)
+++ trunk/docs/reference/gtk/gtk-sections.txt	Mon Sep 29 20:55:31 2008
@@ -2029,6 +2029,7 @@
 GtkIMMulticontext
 gtk_im_multicontext_new
 gtk_im_multicontext_append_menuitems
+gtk_im_multicontext_get_context_id
 <SUBSECTION Standard>
 GTK_IM_MULTICONTEXT
 GTK_IS_IM_MULTICONTEXT

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Mon Sep 29 20:55:31 2008
@@ -2019,6 +2019,7 @@
 #if IN_HEADER(__GTK_IM_MULTICONTEXT_H__)
 #if IN_FILE(__GTK_IM_MULTICONTEXT_C__)
 gtk_im_multicontext_append_menuitems
+gtk_im_multicontext_get_context_id
 gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
 #endif

Modified: trunk/gtk/gtkimmulticontext.c
==============================================================================
--- trunk/gtk/gtkimmulticontext.c	(original)
+++ trunk/gtk/gtkimmulticontext.c	Mon Sep 29 20:55:31 2008
@@ -524,7 +524,7 @@
 
 /**
  * gtk_im_multicontext_append_menuitems:
- * @context: a #GtkIMMultiContext
+ * @context: a #GtkIMMulticontext
  * @menushell: a #GtkMenuShell
  * 
  * Add menuitems for various available input methods to a menu;
@@ -628,5 +628,22 @@
   g_free (contexts);
 }
 
+/**
+ * gtk_im_multicontext_get_context_id:
+ * @context: a #GtkIMMulticontext
+ *
+ * Gets the id of the currently active slave of the @context.
+ *
+ * Returns: the id of the currently active slave
+ *
+ * Since: 2.16
+ */
+const char *
+gtk_im_multicontext_get_context_id (GtkIMMulticontext *context)
+{
+  return context->context_id;
+}
+
+
 #define __GTK_IM_MULTICONTEXT_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtkimmulticontext.h
==============================================================================
--- trunk/gtk/gtkimmulticontext.h	(original)
+++ trunk/gtk/gtkimmulticontext.h	Mon Sep 29 20:55:31 2008
@@ -68,6 +68,8 @@
 
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
 						    GtkMenuShell      *menushell);
+const char  * gtk_im_multicontext_get_context_id   (GtkIMMulticontext *context);
+
 
 G_END_DECLS