Mercurial > pidgin

comparison libgaim/dbus-server.c @ 15080:d24de6319f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17866] Get rid of a bunch of compile warnings committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 01 Dec 2006 08:07:17 +0000
parents 06ae7ffc47e3
children
comparison
equal deleted inserted replaced
15079:32814a36f363 15080:d24de6319f87
666 int id; 666 int id;
667 gint xint; 667 gint xint;
668 guint xuint; 668 guint xuint;
669 gboolean xboolean; 669 gboolean xboolean;
670 gpointer ptr = NULL; 670 gpointer ptr = NULL;
671 gboolean allocated = FALSE;
672 671
673 if (gaim_value_is_outgoing(gaim_values[i])) 672 if (gaim_value_is_outgoing(gaim_values[i]))
674 { 673 {
675 ptr = my_arg(gpointer); 674 ptr = my_arg(gpointer);
676 g_return_if_fail(ptr); 675 g_return_if_fail(ptr);
691 dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean); 690 dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &xboolean);
692 break; 691 break;
693 case GAIM_TYPE_STRING: 692 case GAIM_TYPE_STRING:
694 str = null_to_empty(my_arg(char*)); 693 str = null_to_empty(my_arg(char*));
695 if (!g_utf8_validate(str, -1, NULL)) { 694 if (!g_utf8_validate(str, -1, NULL)) {
695 gchar *tmp;
696 gaim_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n"); 696 gaim_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n");
697 str = gaim_utf8_salvage(str); 697 tmp = gaim_utf8_salvage(str);
698 allocated = TRUE; 698 dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &tmp);
699 g_free(tmp);
700 } else {
701 dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
699 } 702 }
700 dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
701 if (allocated)
702 g_free(str);
703 break; 703 break;
704 case GAIM_TYPE_SUBTYPE: /* registered pointers only! */ 704 case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
705 case GAIM_TYPE_POINTER: 705 case GAIM_TYPE_POINTER:
706 case GAIM_TYPE_OBJECT: 706 case GAIM_TYPE_OBJECT:
707 case GAIM_TYPE_BOXED: 707 case GAIM_TYPE_BOXED: