Refine RequestName code and fix make dpkg errors.

Refine RequestName code and fix make dpkg errors.


BUG=none
TEST=Linux Desktop

[Peng, 2011-04-07 19:30:46]

This CL is based on CL http://codereview.appspot.com/4279042/

[fujiwara, 2011-04-08 06:47:52]

I tested the patch.

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c
File bus/dbusimpl.c (right):

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1026
bus/dbusimpl.c:1026: bus_name_service_set_primary_owner (service, owner, dbus);
In my patch, if the previous primary_owner->do_not_queue == 0, the primary_owner
will be moved to the last in service->owners , and if
primary_owner->do_not_queue != 0, the primary_owner will be deleted.
It was copied from dbus source code.

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1451
bus/dbusimpl.c:1451: * bus_name_service_remove_owner() is called, the owner is
removed
Remove the line of 'GSList *owners = NULL;'
Probably you could set CFLAGS='-Wall'.

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1470
bus/dbusimpl.c:1470: g_hash_table_remove (dbus->names, service->name);
In my patch, if service->owners == NULL, the names->data was removed in names.
Don't you have to remove it?

http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py
File ui/gtk/main.py (left):

http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py#oldcode59
ui/gtk/main.py:59: member='NameAcquired'")
I tested this patch but this way doesn't resolve my problem.
http://fujiwara.fedorapeople.org/ibus/20110404/double_name_acquired.png
The orignal bus of ibus-ui-gtk also receives the NameAcquired from another bus.

Yesterday I thought destination='" + self.__bus.get_name() + '"' in the argument
of self.__bus.add_match() but it also doesn't my problem...

[fujiwara, 2011-04-08 07:04:36]

http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py#oldcode59
If you remove self.__bus.add_match(), don't you also have to remove original
match rule?
https://github.com/ibus/ibus/blob/master/ui/gtk/main.py#L47

[fujiwara, 2011-04-08 07:23:22]

On 2011/04/08 06:47:52, fujiwara wrote:
> http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py#oldcode59
> ui/gtk/main.py:59: member='NameAcquired'")
> I tested this patch but this way doesn't resolve my problem.
> http://fujiwara.fedorapeople.org/ibus/20110404/double_name_acquired.png
> The orignal bus of ibus-ui-gtk also receives the NameAcquired from another
bus.
> 
> Yesterday I thought destination='" + self.__bus.get_name() + '"' in the
argument
> of self.__bus.add_match() but it also doesn't my problem...

Sorry, my problem was another debug code. I confirmed removing
self.__bus.add_match() can fix my problem.


LGTM

[Peng, 2011-04-08 13:38:57]

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c
File bus/dbusimpl.c (right):

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1026
bus/dbusimpl.c:1026: bus_name_service_set_primary_owner (service, owner, dbus);
On 2011/04/08 06:47:52, fujiwara wrote:
> In my patch, if the previous primary_owner->do_not_queue == 0, the
primary_owner
> will be moved to the last in service->owners , and if
> primary_owner->do_not_queue != 0, the primary_owner will be deleted.
> It was copied from dbus source code.

Done.

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1451
bus/dbusimpl.c:1451: * bus_name_service_remove_owner() is called, the owner is
removed
On 2011/04/08 06:47:52, fujiwara wrote:
> Remove the line of 'GSList *owners = NULL;'
> Probably you could set CFLAGS='-Wall'.

Done.

http://codereview.appspot.com/4368056/diff/2003/bus/dbusimpl.c#newcode1470
bus/dbusimpl.c:1470: g_hash_table_remove (dbus->names, service->name);
On 2011/04/08 06:47:52, fujiwara wrote:
> In my patch, if service->owners == NULL, the names->data was removed in names.
> Don't you have to remove it?

The names is from bus_connection_get_names(). I think we do not need free it.
BusConnection will free it by self.

http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py
File ui/gtk/main.py (left):

http://codereview.appspot.com/4368056/diff/2003/ui/gtk/main.py#oldcode59
ui/gtk/main.py:59: member='NameAcquired'")
On 2011/04/08 06:47:52, fujiwara wrote:
> I tested this patch but this way doesn't resolve my problem.
> http://fujiwara.fedorapeople.org/ibus/20110404/double_name_acquired.png
> The orignal bus of ibus-ui-gtk also receives the NameAcquired from another
bus.
> 
> Yesterday I thought destination='" + self.__bus.get_name() + '"' in the
argument
> of self.__bus.add_match() but it also doesn't my problem...

Are you sure you are using updated panel. It fixes the problem on my box.