AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add a getter for the the sealed context_id field.

Browse Source 
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.


svn path=/trunk/; revision=21546
This commit is contained in:
Matthias Clasen 2008-09-29 20:55:31 +00:00 committed by Matthias Clasen
parent 859aaf903d
commit 680c460ff2
6 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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> 2008-09-29 Matthias Clasen <mclasen@redhat.com>
Bug 107000 – Add signals to GdkKeymap for monitoring caps_lock, etc. Bug 107000 – Add signals to GdkKeymap for monitoring caps_lock, etc.

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
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> 2008-09-29 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk-sections.txt: Add gdk_keymap_get_caps_locks_state. * gdk/gdk-sections.txt: Add gdk_keymap_get_caps_locks_state.

1
docs/reference/gtk/gtk-sections.txt
View File

@ -2029,6 +2029,7 @@ gtk_im_context_simple_get_type
GtkIMMulticontext GtkIMMulticontext
gtk_im_multicontext_new gtk_im_multicontext_new
gtk_im_multicontext_append_menuitems gtk_im_multicontext_append_menuitems
gtk_im_multicontext_get_context_id
<SUBSECTION Standard> <SUBSECTION Standard>
GTK_IM_MULTICONTEXT GTK_IM_MULTICONTEXT
GTK_IS_IM_MULTICONTEXT GTK_IS_IM_MULTICONTEXT

1
gtk/gtk.symbols
View File

@ -2019,6 +2019,7 @@ gtk_im_context_simple_new
#if IN_HEADER(__GTK_IM_MULTICONTEXT_H__) #if IN_HEADER(__GTK_IM_MULTICONTEXT_H__)
#if IN_FILE(__GTK_IM_MULTICONTEXT_C__) #if IN_FILE(__GTK_IM_MULTICONTEXT_C__)
gtk_im_multicontext_append_menuitems gtk_im_multicontext_append_menuitems
gtk_im_multicontext_get_context_id
gtk_im_multicontext_get_type G_GNUC_CONST gtk_im_multicontext_get_type G_GNUC_CONST
gtk_im_multicontext_new gtk_im_multicontext_new
#endif #endif

19
gtk/gtkimmulticontext.c
View File

@ -524,7 +524,7 @@ pathnamecmp (const char *a,
/** /**
* gtk_im_multicontext_append_menuitems: * gtk_im_multicontext_append_menuitems:
* @context: a #GtkIMMultiContext * @context: a #GtkIMMulticontext
* @menushell: a #GtkMenuShell * @menushell: a #GtkMenuShell
* *
* Add menuitems for various available input methods to a menu; * Add menuitems for various available input methods to a menu;
@ -628,5 +628,22 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
g_free (contexts); 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__ #define __GTK_IM_MULTICONTEXT_C__
#include "gtkaliasdef.c" #include "gtkaliasdef.c"

2
gtk/gtkimmulticontext.h
View File

@ -68,6 +68,8 @@ GtkIMContext *gtk_im_multicontext_new (void);
void gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, void gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
GtkMenuShell *menushell); GtkMenuShell *menushell);
const char * gtk_im_multicontext_get_context_id (GtkIMMulticontext *context);
G_END_DECLS G_END_DECLS