~ubuntu-branches/ubuntu/precise/ibus-chewing/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/0001-follow-ibus-property-abi-change.patch

  • Committer: Package Import Robot
  • Author(s): Osamu Aoki
  • Date: 2012-03-04 00:49:22 UTC
  • mfrom: (0.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20120304004922-ngysky23d2zsrsrk
Tags: 1.3.10+clean-2
* Fixed annoying pop-up when enabling IME, causing focus to change.
  Thanks Ruei-Yuan. Closes: #660863
* Fixed FTBFS to sync with ibus 1.4.1.  Thanks Daisuke.
  Closes: #661618

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Daiki Ueno <ueno@unixuser.org>
 
2
Date: Sun, 04 Mar 2012 18:13:45 +0900
 
3
Description: Follow IBusProperty ABI change.
 
4
--- a/src/IBusChewingEngine-input-events.c
 
5
+++ b/src/IBusChewingEngine-input-events.c
 
6
@@ -291,12 +291,12 @@
 
7
        /* Toggle Full <-> Half */
 
8
        chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
 
9
     }else if (strcmp(prop_name,"chewing_settings_prop")==0){
 
10
-       if (self->settings_prop->state==PROP_STATE_UNCHECKED){
 
11
+       if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED){
 
12
            if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
 
13
                self_save_config_all(self);
 
14
            }
 
15
            gtk_widget_hide(self->setting_dialog);
 
16
-           self->settings_prop->state=PROP_STATE_UNCHECKED;
 
17
+           ibus_property_set_state(self->settings_prop, PROP_STATE_UNCHECKED);
 
18
        }
 
19
     }else{
 
20
        G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);
 
21
--- a/src/IBusChewingEngine.gob
 
22
+++ b/src/IBusChewingEngine.gob
 
23
@@ -1041,12 +1041,12 @@
 
24
            /* Toggle Full <-> Half */
 
25
            chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
 
26
        }else if (strcmp(prop_name,"chewing_settings_prop")==0){
 
27
-           if (self->settings_prop->state==PROP_STATE_UNCHECKED){
 
28
+           if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED){
 
29
                if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
 
30
                    self_save_config_all(self);
 
31
                }
 
32
                gtk_widget_hide(self->setting_dialog);
 
33
-               self->settings_prop->state=PROP_STATE_UNCHECKED;
 
34
+               ibus_property_set_state(self->settings_prop, PROP_STATE_UNCHECKED);
 
35
            }
 
36
        }else{
 
37
            G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);