diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 1 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 1 | ||||
| -rw-r--r-- | gtk/gtkimmulticontext.c | 19 | ||||
| -rw-r--r-- | gtk/gtkimmulticontext.h | 2 |
6 files changed, 32 insertions, 1 deletions
@@ -1,5 +1,11 @@ 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. + +2008-09-29 Matthias Clasen <mclasen@redhat.com> + Bug 107000 – Add signals to GdkKeymap for monitoring caps_lock, etc. * gdk/gdk.symbols: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 2ce71413a6..4b401ef16f 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,9 @@ 2008-09-29 Matthias Clasen <mclasen@redhat.com> + * gtk/gtk-sections.txt: Add gtk_im_multi_context_get_context_id. + +2008-09-29 Matthias Clasen <mclasen@redhat.com> + * gdk/gdk-sections.txt: Add gdk_keymap_get_caps_locks_state. 2008-09-17 Matthias Clasen <mclasen@redhat.com> diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 8c854ee201..90980ce187 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2029,6 +2029,7 @@ gtk_im_context_simple_get_type 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 diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 1d68fec073..ebe20d4b8e 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2019,6 +2019,7 @@ gtk_im_context_simple_new #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 diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index f33a6cc750..70820a942a 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -524,7 +524,7 @@ pathnamecmp (const char *a, /** * 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 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, 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" diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h index f02bd30db4..9e444cb00a 100644 --- a/gtk/gtkimmulticontext.h +++ b/gtk/gtkimmulticontext.h @@ -68,6 +68,8 @@ GtkIMContext *gtk_im_multicontext_new (void); void gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, GtkMenuShell *menushell); +const char * gtk_im_multicontext_get_context_id (GtkIMMulticontext *context); + G_END_DECLS |