Attachment #127797 for bug #171653

View | Details | Raw Unified | Return to bug 171653
Collapse All | Expand All

Lines 6-13 Link Here

(-)./Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= ibus-chewing	8	PORTNAME= ibus-chewing
9	PORTVERSION= 1.3.10	9	PORTVERSION= 1.4.2
10	PORTREVISION= 2
11	CATEGORIES= chinese	10	CATEGORIES= chinese
12	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-Source	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-Source

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (ibus-chewing-1.3.10-Source.tar.gz) = 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8	1	SHA256 (ibus-chewing-1.4.2-Source.tar.gz) = 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f
2	SIZE (ibus-chewing-1.3.10-Source.tar.gz) = 75365	2	SIZE (ibus-chewing-1.4.2-Source.tar.gz) = 84351




http://bugs.gentoo.org/407695

--- src/IBusChewingEngine-input-events.c
+++ src/IBusChewingEngine-input-events.c
@@ -291,12 +291,21 @@
 	/* Toggle Full <-> Half */
 	chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
     }else if (strcmp(prop_name,"chewing_settings_prop")==0){
-	if (self->settings_prop->state==PROP_STATE_UNCHECKED){
+#if IBUS_CHECK_VERSION(1, 4, 0)
+	if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
+#else
+	if (self->settings_prop->state==PROP_STATE_UNCHECKED)
+#endif
+	{
 	    if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
 		self_save_config_all(self);
 	    }
 	    gtk_widget_hide(self->setting_dialog);
+#if IBUS_CHECK_VERSION(1, 4, 0)
+		ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
+#else
 	    self->settings_prop->state=PROP_STATE_UNCHECKED;
+#endif
 	}
     }else{
 	G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);




http://bugs.gentoo.org/407695

--- src/IBusChewingEngine.gob
+++ src/IBusChewingEngine.gob
@@ -1041,12 +1041,21 @@
 	    /* Toggle Full <-> Half */
 	    chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
 	}else if (strcmp(prop_name,"chewing_settings_prop")==0){
-	    if (self->settings_prop->state==PROP_STATE_UNCHECKED){
+#if IBUS_CHECK_VERSION(1, 4, 0)
+		if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
+#else
+	    if (self->settings_prop->state==PROP_STATE_UNCHECKED)
+#endif
+		{
 		if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
 		    self_save_config_all(self);
 		}
 		gtk_widget_hide(self->setting_dialog);
+#if IBUS_CHECK_VERSION(1, 4, 0)
+		ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
+#else
 		self->settings_prop->state=PROP_STATE_UNCHECKED;
+#endif
 	    }
 	}else{
 	    G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);

Lines 1-4 Link Here

(-)./pkg-plist (-1 / +1 lines)
1	libexec/ibus-engine-chewing	1	lib/ibus-engine-chewing
2	%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS	2	%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS
3	%%DOCSDIR%%-%%PORTVERSION%%/COPYING	3	%%DOCSDIR%%-%%PORTVERSION%%/COPYING
4	%%DOCSDIR%%-%%PORTVERSION%%/ChangeLog	4	%%DOCSDIR%%-%%PORTVERSION%%/ChangeLog

Return to bug 171653

Lines 1-27 Link Here

(-)./files/patch-src-IBusChewingEngine-input-events.c (-27 lines)
1	http://bugs.gentoo.org/407695
2
3	--- src/IBusChewingEngine-input-events.c
4	+++ src/IBusChewingEngine-input-events.c
5	@@ -291,12 +291,21 @@
6	/* Toggle Full <-> Half */
7	chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
8	}else if (strcmp(prop_name,"chewing_settings_prop")==0){
9	- if (self->settings_prop->state==PROP_STATE_UNCHECKED){
10	+#if IBUS_CHECK_VERSION(1, 4, 0)
11	+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
12	+#else
13	+ if (self->settings_prop->state==PROP_STATE_UNCHECKED)
14	+#endif
15	+ {
16	if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
17	self_save_config_all(self);
18	}
19	gtk_widget_hide(self->setting_dialog);
20	+#if IBUS_CHECK_VERSION(1, 4, 0)
21	+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
22	+#else
23	self->settings_prop->state=PROP_STATE_UNCHECKED;
24	+#endif
25	}
26	}else{
27	G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state);

Lines 1-27 Link Here

(-)./files/patch-src-IBusChewingEngine.gob (-27 lines)
1	http://bugs.gentoo.org/407695
2
3	--- src/IBusChewingEngine.gob
4	+++ src/IBusChewingEngine.gob
5	@@ -1041,12 +1041,21 @@
6	/* Toggle Full <-> Half */
7	chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
8	}else if (strcmp(prop_name,"chewing_settings_prop")==0){
9	- if (self->settings_prop->state==PROP_STATE_UNCHECKED){
10	+#if IBUS_CHECK_VERSION(1, 4, 0)
11	+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
12	+#else
13	+ if (self->settings_prop->state==PROP_STATE_UNCHECKED)
14	+#endif
15	+ {
16	if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
17	self_save_config_all(self);
18	}
19	gtk_widget_hide(self->setting_dialog);
20	+#if IBUS_CHECK_VERSION(1, 4, 0)
21	+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
22	+#else
23	self->settings_prop->state=PROP_STATE_UNCHECKED;
24	+#endif
25	}
26	}else{
27	G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state);