diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-06 14:54:00 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-06 14:54:00 +0800 |
| commit | 7818373100d18f04dc049a466f9f30bb32965176 (patch) | |
| tree | 2a4d5d4c29e585ed35a060c6280db4f2a53ebdcb /src | |
| parent | 5014bc1a8e8544ec087b631b55fc4d6907051c13 (diff) | |
| download | ibus-7818373100d18f04dc049a466f9f30bb32965176.tar.gz ibus-7818373100d18f04dc049a466f9f30bb32965176.tar.xz ibus-7818373100d18f04dc049a466f9f30bb32965176.zip | |
Add restart menu item in system menu.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ibusbus.c | 4 | ||||
| -rw-r--r-- | src/ibusbus.h | 3 | ||||
| -rw-r--r-- | src/ibusobject.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ibusbus.c b/src/ibusbus.c index be72770..481d303 100644 --- a/src/ibusbus.c +++ b/src/ibusbus.c @@ -684,7 +684,8 @@ ibus_bus_get_connection (IBusBus *bus) } gboolean -ibus_bus_kill (IBusBus *bus) +ibus_bus_exit (IBusBus *bus, + gboolean restart) { g_assert (IBUS_IS_BUS (bus)); @@ -694,6 +695,7 @@ ibus_bus_kill (IBusBus *bus) IBUS_PATH_IBUS, IBUS_INTERFACE_IBUS, "Kill", + G_TYPE_BOOLEAN, &restart, G_TYPE_INVALID, G_TYPE_INVALID); return result; diff --git a/src/ibusbus.h b/src/ibusbus.h index e548c82..be1fba8 100644 --- a/src/ibusbus.h +++ b/src/ibusbus.h @@ -81,7 +81,8 @@ void ibus_bus_remove_match (IBusBus *bus, const gchar *ibus_bus_get_name_owner (IBusBus *bus, const gchar *name); /* declare ibus methods */ -gboolean ibus_bus_kill (IBusBus *bus); +gboolean ibus_bus_exit (IBusBus *bus, + gboolean restart); IBusInputContext *ibus_bus_create_input_context (IBusBus *bus, diff --git a/src/ibusobject.h b/src/ibusobject.h index 2c09882..67fb95b 100644 --- a/src/ibusobject.h +++ b/src/ibusobject.h @@ -50,9 +50,10 @@ typedef enum { IBUS_RESERVED_2 = (1 << 3), } IBusObjectFlags; -#define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags) +#define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags) #define IBUS_OBJECT_SET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END #define IBUS_OBJECT_UNSET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END +#define IBUS_OBJECT_DESTROYED(obj) (IBUS_OBJECT_FLAGS (obj) & IBUS_DESTROYED) G_BEGIN_DECLS |