Mercurial > pidgin
changeset 21491:228bd30a56f2
merge of '1a57741b94a1fc6f2b23038e3aa24ee2adf4181c'
and '734b8d04a15338ec9422a35540e816664287a252'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 14 Nov 2007 05:29:19 +0000 |
| parents | f9b468c5d0aa (diff) f2e42e09e635 (current diff) |
| children | bcc8c0648ae7 0abf2d9b6f89 dddf6ce7377f |
| files | |
| diffstat | 3 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntlabel.c Wed Nov 14 05:27:47 2007 +0000 +++ b/finch/libgnt/gntlabel.c Wed Nov 14 05:29:19 2007 +0000 @@ -130,7 +130,10 @@ PROP_TEXT_FLAG, g_param_spec_int("text-flag", "Text flag", "Text attribute to use when displaying the text in the label.", - GNT_TEXT_FLAG_NORMAL, GNT_TEXT_FLAG_HIGHLIGHT, GNT_TEXT_FLAG_NORMAL, + GNT_TEXT_FLAG_NORMAL, + GNT_TEXT_FLAG_NORMAL|GNT_TEXT_FLAG_BOLD|GNT_TEXT_FLAG_UNDERLINE| + GNT_TEXT_FLAG_BLINK|GNT_TEXT_FLAG_DIM|GNT_TEXT_FLAG_HIGHLIGHT, + GNT_TEXT_FLAG_NORMAL, G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB ) );
--- a/libpurple/connection.c Wed Nov 14 05:27:47 2007 +0000 +++ b/libpurple/connection.c Wed Nov 14 05:29:19 2007 +0000 @@ -664,7 +664,7 @@ PURPLE_SUBTYPE_CONNECTION)); purple_signal_register(handle, "connection-error", - purple_marshal_VOID__POINTER_INT_POINTER, NULL, 1, + purple_marshal_VOID__POINTER_INT_POINTER, NULL, 3, purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), purple_value_new(PURPLE_TYPE_ENUM),
--- a/pidgin/gtkimhtml.c Wed Nov 14 05:27:47 2007 +0000 +++ b/pidgin/gtkimhtml.c Wed Nov 14 05:29:19 2007 +0000 @@ -1165,17 +1165,15 @@ static void gtk_imhtml_undo(GtkIMHtml *imhtml) { g_return_if_fail(GTK_IS_IMHTML(imhtml)); - g_return_if_fail(imhtml->editable); - - gtk_source_undo_manager_undo(imhtml->undo_manager); + if (imhtml->editable) + gtk_source_undo_manager_undo(imhtml->undo_manager); } static void gtk_imhtml_redo(GtkIMHtml *imhtml) { g_return_if_fail(GTK_IS_IMHTML(imhtml)); - g_return_if_fail(imhtml->editable); - - gtk_source_undo_manager_redo(imhtml->undo_manager); + if (imhtml->editable) + gtk_source_undo_manager_redo(imhtml->undo_manager); } @@ -2950,8 +2948,10 @@ } else if (imhtml->edit.link == NULL && gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) { GtkIMHtmlFontDetail *fd; - gchar *sml = NULL; + + br = FALSE; + if (fonts) { fd = fonts->data; sml = fd->sml; @@ -2969,6 +2969,7 @@ wpos = 0; ws[0] = 0; } else if (*c == '&' && (amp = purple_markup_unescape_entity(c, &tlen))) { + br = FALSE; while(*amp) { ws [wpos++] = *amp++; } @@ -2997,6 +2998,7 @@ c++; pos++; } else if ((len_protocol = gtk_imhtml_is_protocol(c)) > 0){ + br = FALSE; while(len_protocol--){ /* Skip the next len_protocol characters, but make sure they're copied into the ws array. @@ -3005,6 +3007,7 @@ pos++; } } else if (*c) { + br = FALSE; ws [wpos++] = *c++; pos++; } else {