Mercurial > pidgin.yaz
changeset 27996:b29eac4769e9
merge of '16bc7e72b5dd239ce65c63a388c2d39efc5b7c32'
and '31cfeb857db37f5ed2d12cf084073349436c89e5'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 22 Jul 2009 04:15:02 +0000 |
| parents | 151ec92db74c (current diff) 9f9e70099573 (diff) |
| children | 4c5f35f2b1ff 32ef0358b469 |
| files | |
| diffstat | 4 files changed, 32 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/blist.c Wed Jul 22 04:14:01 2009 +0000 +++ b/libpurple/blist.c Wed Jul 22 04:15:02 2009 +0000 @@ -1299,8 +1299,8 @@ PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurpleChat *chat; - g_return_val_if_fail(account != NULL, FALSE); - g_return_val_if_fail(components != NULL, FALSE); + g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(components != NULL, NULL); chat = g_new0(PurpleChat, 1); chat->account = account;
--- a/libpurple/mediamanager.c Wed Jul 22 04:14:01 2009 +0000 +++ b/libpurple/mediamanager.c Wed Jul 22 04:15:02 2009 +0000 @@ -780,7 +780,8 @@ pad = gst_element_get_static_pad(queue, "sink"); peer = gst_pad_get_peer(pad); gst_object_unref(pad); - gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); + if (peer != NULL) + gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); gst_element_set_locked_state(queue, TRUE); gst_element_set_state(queue, GST_STATE_NULL); gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
--- a/libpurple/win32/targets.mak Wed Jul 22 04:14:01 2009 +0000 +++ b/libpurple/win32/targets.mak Wed Jul 22 04:15:02 2009 +0000 @@ -36,7 +36,7 @@ $(PIDGIN_INSTALL_DIR): mkdir -p $(PIDGIN_INSTALL_DIR) -$(PIDGIN_INSTALL_PERLMOD_DIR): +$(PIDGIN_INSTALL_PERL_DIR): mkdir -p $(PIDGIN_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR):
--- a/pidgin/gtkblist.c Wed Jul 22 04:14:01 2009 +0000 +++ b/pidgin/gtkblist.c Wed Jul 22 04:15:02 2009 +0000 @@ -6980,12 +6980,9 @@ static void add_chat_cb(GtkWidget *w, PidginAddChatData *data) { - GHashTable *components; GList *tmp; PurpleChat *chat; - PurpleGroup *group; - const char *group_name; - const char *value; + GHashTable *components; components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); @@ -7001,7 +6998,8 @@ } else { - value = gtk_entry_get_text(tmp->data); + const char *value = gtk_entry_get_text(tmp->data); + if (*value != '\0') g_hash_table_replace(components, g_strdup(g_object_get_data(tmp->data, "identifier")), @@ -7010,28 +7008,31 @@ } chat = purple_chat_new(data->chat_data.rq_data.account, - gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), - components); - - group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); - - group = NULL; - if ((group_name != NULL) && (*group_name != '\0') && ((group = purple_find_group(group_name)) == NULL)) - { - group = purple_group_new(group_name); - purple_blist_add_group(group, NULL); - } - - if (chat != NULL) - { + gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), + components); + + if (chat != NULL) { + PurpleGroup *group; + const char *group_name; + + group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); + + group = NULL; + if ((group_name != NULL) && (*group_name != '\0') && + ((group = purple_find_group(group_name)) == NULL)) + { + group = purple_group_new(group_name); + purple_blist_add_group(group, NULL); + } + purple_blist_add_chat(chat, group, NULL); - } - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin))) - purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent))) - purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin))) + purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent))) + purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE); + } gtk_widget_destroy(data->chat_data.rq_data.window); g_free(data->chat_data.default_chat_name);