Mercurial > pidgin.yaz
comparison src/dbus-server.c @ 11903:c9312177821a
[gaim-migrate @ 14194]
"make distcheck" fixes - mostly fixing DBUS things so they can
compile outside the source tree, and a few compile warning fixes.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 30 Oct 2005 17:24:38 +0000 |
parents | 57fccea36e36 |
children | 2078f65a8e98 |
comparison
equal
deleted
inserted
replaced
11902:391acec18e46 | 11903:c9312177821a |
---|---|
562 0, &error); | 562 0, &error); |
563 | 563 |
564 if (dbus_error_is_set (&error)) { | 564 if (dbus_error_is_set (&error)) { |
565 dbus_connection_unref(gaim_dbus_connection); | 565 dbus_connection_unref(gaim_dbus_connection); |
566 dbus_error_free(&error); | 566 dbus_error_free(&error); |
567 gaim_dbus_connection = NULL; | |
567 gaim_debug_error("dbus", "Failed to get serv name: %s\n", error.name); | 568 gaim_debug_error("dbus", "Failed to get serv name: %s\n", error.name); |
568 return FALSE; | 569 return FALSE; |
569 } | 570 } |
570 | 571 |
571 dbus_connection_setup_with_g_main(gaim_dbus_connection, NULL); | 572 dbus_connection_setup_with_g_main(gaim_dbus_connection, NULL); |
666 } | 667 } |
667 } | 668 } |
668 | 669 |
669 #undef my_arg | 670 #undef my_arg |
670 | 671 |
671 void gaim_dbus_signal_emit_gaim(char *name, int num_values, | 672 void gaim_dbus_signal_emit_gaim(const char *name, int num_values, |
672 GaimValue **values, va_list vargs) | 673 GaimValue **values, va_list vargs) |
673 { | 674 { |
674 DBusMessage *signal; | 675 DBusMessage *signal; |
675 DBusMessageIter iter; | 676 DBusMessageIter iter; |
676 char *newname; | 677 char *newname; |
677 | 678 |
679 #if 0 /* this is noisy with no dbus connection */ | |
678 g_return_if_fail(gaim_dbus_connection); | 680 g_return_if_fail(gaim_dbus_connection); |
681 #else | |
682 if (gaim_dbus_connection == NULL) | |
683 return; | |
684 #endif | |
685 | |
679 | 686 |
680 /* The test below is a hack that prevents our "dbus-method-called" | 687 /* The test below is a hack that prevents our "dbus-method-called" |
681 signal from being propagated to dbus. What we really need is a | 688 signal from being propagated to dbus. What we really need is a |
682 flag for each signal that states whether this signal is to be | 689 flag for each signal that states whether this signal is to be |
683 dbus-propagated or not. */ | 690 dbus-propagated or not. */ |