diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-24 17:04:27 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-24 17:04:27 +0800 |
| commit | d9d401145a59e095753e86d05c55bd57e3735596 (patch) | |
| tree | 9255262a725fde4ae904fde9766edece18bda753 | |
| parent | 8df6310b6eaf26d31daf6d4fdf4d4c41265e64ec (diff) | |
| download | ibus-d9d401145a59e095753e86d05c55bd57e3735596.tar.gz ibus-d9d401145a59e095753e86d05c55bd57e3735596.tar.xz ibus-d9d401145a59e095753e86d05c55bd57e3735596.zip | |
Replace priority in EngineDesc with rank.
| -rw-r--r-- | bus/ibusimpl.c | 2 | ||||
| -rw-r--r-- | src/ibusenginedesc.c | 8 | ||||
| -rw-r--r-- | src/ibusenginedesc.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c index 09e5c40..f5e9794 100644 --- a/bus/ibusimpl.c +++ b/bus/ibusimpl.c @@ -233,7 +233,7 @@ static gint _engine_desc_cmp (IBusEngineDesc *desc1, IBusEngineDesc *desc2) { - return - ((gint) desc1->priority) + ((gint) desc2->priority); + return - ((gint) desc1->rank) + ((gint) desc2->rank); } static void diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c index bf67843..39062b3 100644 --- a/src/ibusenginedesc.c +++ b/src/ibusenginedesc.c @@ -109,7 +109,7 @@ ibus_engine_desc_init (IBusEngineDesc *desc) desc->author = NULL; desc->icon = NULL; desc->layout = NULL; - desc->priority = 0; + desc->rank = 0; } static void @@ -264,7 +264,7 @@ ibus_engine_desc_output (IBusEngineDesc *desc, OUTPUT_ENTRY_1(icon); OUTPUT_ENTRY_1(layout); g_string_append_indent (output, indent + 1); - g_string_append_printf (output, "<priority>%u</priority>", desc->priority); + g_string_append_printf (output, "<rank>%u</rank>", desc->rank); #undef OUTPUT_ENTRY #undef OUTPUT_ENTRY_1 g_string_append_indent (output, indent); @@ -298,8 +298,8 @@ ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc, PARSE_ENTRY_1(layout); #undef PARSE_ENTRY #undef PARSE_ENTRY1 - if (g_strcmp0 (sub_node->name , "priority") == 0) { - desc->priority = atoi (sub_node->text); + if (g_strcmp0 (sub_node->name , "rank") == 0) { + desc->rank = atoi (sub_node->text); continue; } g_warning ("<engines> element contains invalidate element <%s>", sub_node->name); diff --git a/src/ibusenginedesc.h b/src/ibusenginedesc.h index 68d8e9f..1ba9153 100644 --- a/src/ibusenginedesc.h +++ b/src/ibusenginedesc.h @@ -59,7 +59,7 @@ struct _IBusEngineDesc { gchar *author; gchar *icon; gchar *layout; - guint priority; + guint rank; }; struct _IBusEngineDescClass { |