Mercurial > pidgin
changeset 17714:9d5121f2ab5d
Minor formatting tweaks for the dbus_uniq code.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 16 May 2007 20:00:20 +0000 |
| parents | 601594a64190 |
| children | 60ca4431f867 c0dd45834fd9 |
| files | COPYRIGHT libpurple/core.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Wed May 16 19:35:17 2007 +0000 +++ b/COPYRIGHT Wed May 16 20:00:20 2007 +0000 @@ -303,7 +303,7 @@ David Schmitt Mark Schneider Evan Schoenberg -Gabriel Schulof +Gabriel Schulhof Federico Schwindt Torrey Searle Peter Seebach
--- a/libpurple/core.c Wed May 16 19:35:17 2007 +0000 +++ b/libpurple/core.c Wed May 16 20:00:20 2007 +0000 @@ -302,8 +302,7 @@ if (reply) { dbus_error_init(&dbus_error); dbus_message_get_args(reply, &dbus_error, DBUS_TYPE_STRING, &remote_user_dir, DBUS_TYPE_INVALID); - if (remote_user_dir) - remote_user_dir = g_strdup(remote_user_dir); + remote_user_dir = g_strdup(remote_user_dir); dbus_error_free(&dbus_error); dbus_message_unref(reply); } @@ -321,7 +320,7 @@ return; if ((msg = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "PurpleBlistShow")) == NULL) - return ; + return; dbus_error_init(&dbus_error); if ((reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, 5000, &dbus_error)) != NULL) { @@ -333,7 +332,8 @@ gboolean purple_core_ensure_single_instance() { -gboolean is_single_instance = TRUE; + gboolean is_single_instance = TRUE; + #ifdef HAVE_DBUS /* in the future, other mechanisms might have already set this to FALSE */ if (is_single_instance) { @@ -357,6 +357,7 @@ } } #endif /* HAVE_DBUS */ + return is_single_instance; }