X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimmulticontext.h;h=1979bf673c10c6c0313ed7f4bfd04a0e65d962b8;hb=0cc688aa92b8fe5452b63fb49c51204498a2988b;hp=635a24ece10947cbbabc40fc0ba5f95e4c94fe53;hpb=eff99c282cb6967f4b1df2f2b53f2bbb034ce79a;p=~andy%2Fgtk

diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 635a24ece..1979bf673 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -12,18 +12,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IM_MULTICONTEXT_H__
 #define __GTK_IM_MULTICONTEXT_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenushell.h>
 
@@ -45,11 +43,8 @@ struct _GtkIMMulticontext
 {
   GtkIMContext object;
 
-  GtkIMContext *slave;
-
+  /*< private >*/
   GtkIMMulticontextPrivate *priv;
-
-  gchar *context_id;
 };
 
 struct _GtkIMMulticontextClass
@@ -68,7 +63,11 @@ 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);
 
+void          gtk_im_multicontext_set_context_id   (GtkIMMulticontext *context,
+                                                    const char        *context_id);
+ 
 G_END_DECLS
 
 #endif /* __GTK_IM_MULTICONTEXT_H__ */