Mercurial > pidgin.yaz
comparison libpurple/notify.c @ 17319:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 30 May 2007 02:56:25 +0000 |
parents | 46351036fdb4 |
children | c1c533448097 4ca97b26a8fb e4ee1c5bd51e |
comparison
equal
deleted
inserted
replaced
16747:496855295bd7 | 17319:8a7238fb7905 |
---|---|
20 * | 20 * |
21 * You should have received a copy of the GNU General Public License | 21 * You should have received a copy of the GNU General Public License |
22 * along with this program; if not, write to the Free Software | 22 * along with this program; if not, write to the Free Software |
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 */ | 24 */ |
25 #include "internal.h" | |
26 #include "dbus-maybe.h" | |
25 #include "notify.h" | 27 #include "notify.h" |
26 | 28 |
27 static PurpleNotifyUiOps *notify_ui_ops = NULL; | 29 static PurpleNotifyUiOps *notify_ui_ops = NULL; |
28 static GList *handles = NULL; | 30 static GList *handles = NULL; |
29 | 31 |
479 purple_notify_user_info_entry_new(const char *label, const char *value) | 481 purple_notify_user_info_entry_new(const char *label, const char *value) |
480 { | 482 { |
481 PurpleNotifyUserInfoEntry *user_info_entry; | 483 PurpleNotifyUserInfoEntry *user_info_entry; |
482 | 484 |
483 user_info_entry = g_new0(PurpleNotifyUserInfoEntry, 1); | 485 user_info_entry = g_new0(PurpleNotifyUserInfoEntry, 1); |
486 PURPLE_DBUS_REGISTER_POINTER(user_info_entry, PurpleNotifyUserInfoEntry); | |
484 user_info_entry->label = g_strdup(label); | 487 user_info_entry->label = g_strdup(label); |
485 user_info_entry->value = g_strdup(value); | 488 user_info_entry->value = g_strdup(value); |
486 user_info_entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR; | 489 user_info_entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR; |
487 | 490 |
488 return user_info_entry; | 491 return user_info_entry; |
493 { | 496 { |
494 g_return_if_fail(user_info_entry != NULL); | 497 g_return_if_fail(user_info_entry != NULL); |
495 | 498 |
496 g_free(user_info_entry->label); | 499 g_free(user_info_entry->label); |
497 g_free(user_info_entry->value); | 500 g_free(user_info_entry->value); |
501 PURPLE_DBUS_UNREGISTER_POINTER(user_info_entry); | |
498 g_free(user_info_entry); | 502 g_free(user_info_entry); |
499 } | 503 } |
500 | 504 |
501 PurpleNotifyUserInfo * | 505 PurpleNotifyUserInfo * |
502 purple_notify_user_info_new() | 506 purple_notify_user_info_new() |
503 { | 507 { |
504 PurpleNotifyUserInfo *user_info; | 508 PurpleNotifyUserInfo *user_info; |
505 | 509 |
506 user_info = g_new0(PurpleNotifyUserInfo, 1); | 510 user_info = g_new0(PurpleNotifyUserInfo, 1); |
511 PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo); | |
507 user_info->user_info_entries = NULL; | 512 user_info->user_info_entries = NULL; |
508 | 513 |
509 return user_info; | 514 return user_info; |
510 } | 515 } |
511 | 516 |
519 | 524 |
520 purple_notify_user_info_entry_destroy(user_info_entry); | 525 purple_notify_user_info_entry_destroy(user_info_entry); |
521 } | 526 } |
522 | 527 |
523 g_list_free(user_info->user_info_entries); | 528 g_list_free(user_info->user_info_entries); |
529 PURPLE_DBUS_UNREGISTER_POINTER(user_info); | |
524 g_free(user_info); | 530 g_free(user_info); |
525 } | 531 } |
526 | 532 |
527 GList * | 533 GList * |
528 purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info) | 534 purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info) |