diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2018-03-08 00:26:39 +0000 |
|---|---|---|
| committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2018-03-28 09:28:32 +0000 |
| commit | 139a627a85c07c4f838681f73e95ec86da3d7ecd (patch) | |
| tree | b082d05b5a82e427b11a7ad7b40d43d22373ac63 /gtk/gtkimcontextime.c | |
| parent | 7ccf6a7df74af888202a942dc806b6b1d3b9c530 (diff) | |
| download | gtk+-139a627a85c07c4f838681f73e95ec86da3d7ecd.tar.gz | |
gtkimcontextime: fix to compile again
This makes the code compile again, though obviously there have been
some substantial changes in how IM contexts work, so it's possible
that IME IM context doesn't work now.
https://bugzilla.gnome.org/show_bug.cgi?id=773299
Diffstat (limited to 'gtk/gtkimcontextime.c')
| -rw-r--r-- | gtk/gtkimcontextime.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c index a3c8150a1a..de202faa46 100644 --- a/gtk/gtkimcontextime.c +++ b/gtk/gtkimcontextime.c @@ -34,7 +34,7 @@ #include "gdk/gdkkeysyms.h" #include "gdk/win32/gdkwin32.h" -#include "gdk/gdkkeysyms.h" +#include "gtk/gtkimmodule.h" #include <pango/pango.h> @@ -81,8 +81,6 @@ struct _GtkIMContextIMEPrivate /* GObject class methods */ -static void gtk_im_context_ime_class_init (GtkIMContextIMEClass *class); -static void gtk_im_context_ime_init (GtkIMContextIME *context_ime); static void gtk_im_context_ime_dispose (GObject *obj); static void gtk_im_context_ime_finalize (GObject *obj); @@ -126,9 +124,6 @@ static void cb_client_widget_hierarchy_changed (GtkWidget *widget, GtkWidget *widget2, GtkIMContextIME *context_ime); -#define GTK_TYPE_IM_CONTEXT_IME (gtk_im_context_ime_get_type ()) -#define GTK_IM_CONTEXT_IME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT_IME, GtkIMContextIME)) - G_DEFINE_TYPE_WITH_CODE (GtkIMContextIME, gtk_im_context_ime, GTK_TYPE_IM_CONTEXT, gtk_im_module_ensure_extension_point (); g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, @@ -193,8 +188,7 @@ gtk_im_context_ime_dispose (GObject *obj) FREE_PREEDIT_BUFFER (context_ime); - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (obj); + G_OBJECT_CLASS (gtk_im_context_ime_parent_class)->dispose (obj); } @@ -207,8 +201,7 @@ gtk_im_context_ime_finalize (GObject *obj) g_free (context_ime->priv); context_ime->priv = NULL; - if (G_OBJECT_CLASS (parent_class)->finalize) - G_OBJECT_CLASS (parent_class)->finalize (obj); + G_OBJECT_CLASS (gtk_im_context_ime_parent_class)->finalize (obj); } |