Mercurial > pidgin.yaz
comparison libpurple/core.c @ 17163:a217e9b9ebc2
merge of 'bc75c50283ea211d6f97caefcb83db0e34e10bfe'
and 'de314ef335216e20484a1ce9d840a1828f4cc9f9'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 06:55:53 +0000 |
| parents | b5935a854ccb 9d5121f2ab5d |
| children | 1d6007400837 |
comparison
equal
deleted
inserted
replaced
| 17162:63a09098b0e8 | 17163:a217e9b9ebc2 |
|---|---|
| 318 | 318 |
| 319 if ((dbus_connection = purple_dbus_get_connection()) == NULL) | 319 if ((dbus_connection = purple_dbus_get_connection()) == NULL) |
| 320 return; | 320 return; |
| 321 | 321 |
| 322 if ((msg = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "PurpleBlistShow")) == NULL) | 322 if ((msg = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "PurpleBlistShow")) == NULL) |
| 323 return ; | 323 return; |
| 324 | 324 |
| 325 dbus_error_init(&dbus_error); | 325 dbus_error_init(&dbus_error); |
| 326 if ((reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, 5000, &dbus_error)) != NULL) { | 326 if ((reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, 5000, &dbus_error)) != NULL) { |
| 327 dbus_message_unref(msg); | 327 dbus_message_unref(msg); |
| 328 } | 328 } |
| 354 | 354 |
| 355 g_free(dbus_owner_user_dir); | 355 g_free(dbus_owner_user_dir); |
| 356 } | 356 } |
| 357 } | 357 } |
| 358 #endif /* HAVE_DBUS */ | 358 #endif /* HAVE_DBUS */ |
| 359 | |
| 359 return is_single_instance; | 360 return is_single_instance; |
| 360 } | 361 } |
| 361 | 362 |
| 362 static gboolean | 363 static gboolean |
| 363 move_and_symlink_dir(const char *path, const char *basename, const char *old_base, const char *new_base, const char *relative) | 364 move_and_symlink_dir(const char *path, const char *basename, const char *old_base, const char *new_base, const char *relative) |