| OLD | NEW | 
|---|
| 1 requires 2.0.0 | 1 requires 2.0.0 | 
| 2 | 2 | 
| 3 %alltop{ | 3 %alltop{ | 
| 4 /* | 4 /* | 
| 5  * Copyright © 2009  Red Hat, Inc. All rights reserved. | 5  * Copyright © 2009  Red Hat, Inc. All rights reserved. | 
| 6  * Copyright © 2009  Ding-Yi Chen <dchen at redhat.com> | 6  * Copyright © 2009  Ding-Yi Chen <dchen at redhat.com> | 
| 7  * | 7  * | 
| 8  * This file is part of the ibus-chewing Project. | 8  * This file is part of the ibus-chewing Project. | 
| 9  * | 9  * | 
| 10  * This program is free software; you can redistribute it and/or | 10  * This program is free software; you can redistribute it and/or | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 105 enum ENGINE_STATUS{ | 105 enum ENGINE_STATUS{ | 
| 106     INITIALIZED=                0x1, | 106     INITIALIZED=                0x1, | 
| 107     ENABLED=                    0x2, | 107     ENABLED=                    0x2, | 
| 108     FOCUS_IN=                   0x4, | 108     FOCUS_IN=                   0x4, | 
| 109     SHOW_CANDIDATE=             0x8, | 109     SHOW_CANDIDATE=             0x8, | 
| 110     NEED_COMMIT=                0x10, | 110     NEED_COMMIT=                0x10, | 
| 111     FORCE_COMMIT=               0x20, | 111     FORCE_COMMIT=               0x20, | 
| 112 } Engine:Status; | 112 } Engine:Status; | 
| 113 | 113 | 
| 114 %h{ | 114 %h{ | 
| 115 #include "maker-dialog.h" | 115 // Chromium change: Remove reference to maker-dialog, and stub in the required | 
|  | 116 //   structures and enums here. | 
|  | 117 //#include "maker-dialog.h" | 
|  | 118 | 
|  | 119 enum { | 
|  | 120     MAKER_DIALOG_PROPERTY_FLAG_INVISIBLE   =0x1, | 
|  | 121     MAKER_DIALOG_PROPERTY_FLAG_INSENSITIVE =0x2, | 
|  | 122     MAKER_DIALOG_PROPERTY_FLAG_INEDITABLE =0x4, | 
|  | 123     MAKER_DIALOG_PROPERTY_FLAG_HAS_TRANSLATION =0x8, | 
|  | 124     MAKER_DIALOG_PROPERTY_FLAG_TRANSLATION_WITH_CONTEXT =0x10, | 
|  | 125 }; | 
|  | 126 typedef guint MakerDialogPropertyFlags; | 
|  | 127 typedef struct _PropertyContext PropertyContext; | 
|  | 128 typedef GValue *(* CallbackGetFunc)(PropertyContext *ctx); | 
|  | 129 typedef void(* CallbackSetFunc)(PropertyContext *ctx, GValue *value); | 
|  | 130 typedef struct{ | 
|  | 131     GType valueType; | 
|  | 132     gchar key[30]; | 
|  | 133     gchar pageName[50]; | 
|  | 134     gchar label[200]; | 
|  | 135     gchar defaultValue[100]; | 
|  | 136     const gchar **validValues; | 
|  | 137     gchar *translationContext; | 
|  | 138 | 
|  | 139     gint min; | 
|  | 140     gint max; | 
|  | 141 | 
|  | 142     CallbackGetFunc getFunc; | 
|  | 143     CallbackSetFunc setFunc; | 
|  | 144 | 
|  | 145     MakerDialogPropertyFlags propertyFlags; | 
|  | 146     gint width; | 
|  | 147     gint height; | 
|  | 148     const gchar *tooltip; | 
|  | 149     gpointer userData; | 
|  | 150 } PropertySpec; | 
|  | 151 struct _PropertyContext{ | 
|  | 152     PropertySpec *spec; | 
|  | 153     gpointer userData;  //<! User data to be used in callback. | 
|  | 154 | 
|  | 155 }; | 
|  | 156 // END Chromium change | 
|  | 157 | 
| 116 #define GCONF_KEY_PREFIX "/desktop/ibus/engine/Chewing/" | 158 #define GCONF_KEY_PREFIX "/desktop/ibus/engine/Chewing/" | 
| 117 /* For easy symbol input work around */ | 159 /* For easy symbol input work around */ | 
| 118 #define EASY_SYMBOL_INPUT_WORK_AROUND | 160 #define EASY_SYMBOL_INPUT_WORK_AROUND | 
| 119 | 161 | 
| 120 extern PropertySpec propSpecs[]; | 162 extern PropertySpec propSpecs[]; | 
| 121 extern const gchar *page_labels[]; | 163 extern const gchar *page_labels[]; | 
| 122 extern const gchar *button_labels[]; | 164 extern const gchar *button_labels[]; | 
| 123 extern GtkResponseType button_responses[]; | 165 extern GtkResponseType button_responses[]; | 
| 124 #define ZHUYIN_BUFFER_SIZE 12 | 166 #define ZHUYIN_BUFFER_SIZE 12 | 
| 125 | 167 | 
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1114         IBusProperty *prop=self_get_iBusProperty(self, prop_name); | 1156         IBusProperty *prop=self_get_iBusProperty(self, prop_name); | 
| 1115         ibus_property_set_visible(prop,FALSE); | 1157         ibus_property_set_visible(prop,FALSE); | 
| 1116         ibus_engine_update_property(engine,prop); | 1158         ibus_engine_update_property(engine,prop); | 
| 1117     } | 1159     } | 
| 1118 } | 1160 } | 
| 1119 | 1161 | 
| 1120 %{ | 1162 %{ | 
| 1121 #include "IBusChewingEngine-keys.c" | 1163 #include "IBusChewingEngine-keys.c" | 
| 1122 %} | 1164 %} | 
| 1123 | 1165 | 
| OLD | NEW | 
|---|