rpms/ibus/devel ibus-HEAD.patch,1.1,1.2 ibus.spec,1.40,1.41

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9768

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch, to fix bug 484652.

ibus-HEAD.patch:

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-HEAD.patch	13 Feb 2009 02:58:51 -0000	1.1
+++ ibus-HEAD.patch	13 Feb 2009 06:15:14 -0000	1.2
@@ -347,6 +347,32 @@
      server = bus_server_get_default ();
      bus_server_listen (server);
  
+diff --git a/src/ibusbus.c b/src/ibusbus.c
+index 9965761..a567359 100644
+--- a/src/ibusbus.c
++++ b/src/ibusbus.c
+@@ -639,15 +639,20 @@ ibus_bus_exit (IBusBus *bus,
+ {
+     g_assert (IBUS_IS_BUS (bus));
+ 
++    IBusBusPrivate *priv;
++    priv = IBUS_BUS_GET_PRIVATE (bus);
++    
+     gboolean result;
+     result = ibus_bus_call (bus,
+                             IBUS_SERVICE_IBUS,
+                             IBUS_PATH_IBUS,
+                             IBUS_INTERFACE_IBUS,
+-                            "Kill",
++                            "Exit",
+                             G_TYPE_BOOLEAN, &restart,
+                             G_TYPE_INVALID,
+                             G_TYPE_INVALID);
++    ibus_connection_flush (priv->connection);
++    
+     return result;
+ }
+ 
 diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
 index 9ca487d..59690b8 100644
 --- a/src/ibuscomponent.c


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ibus.spec	13 Feb 2009 02:58:51 -0000	1.40
+++ ibus.spec	13 Feb 2009 06:15:14 -0000	1.41
@@ -3,7 +3,7 @@
 %define mod_path ibus-1.1
 Name:       ibus
 Version:    1.1.0.20090211
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -181,6 +181,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-3
+- Update ibus-HEAD.patch, to fix bug 484652.
+
 * Fri Feb 13 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-2
 - Add patch ibus-HEAD.patch, to update ibus to HEAD version.