gaim/gaim

Leak fixes, round 3. Also, fix find in the log viewer to find in all
oldstatus
2005-02-05, Stu Tomlinson
7d93b7f5dad6
Parents 4af65507028c
Children e351335c7e33
Leak fixes, round 3. Also, fix find in the log viewer to find in all
logs, not just every-other-one-you-select.
6 files changed, 488 insertions(+), 4 deletions(-)
  • +2 -0
    ChangeLog
  • +1 -0
    src/gtkblist.c
  • +3 -0
    src/gtkimhtml.c
  • +479 -0
    src/gtklog.c
  • +3 -0
    src/protocols/msn/object.c
  • +0 -4
    src/protocols/oscar/oscar.c
    • --- a/ChangeLog Fri Feb 04 00:43:15 2005 -0500
    +++ b/ChangeLog Sat Feb 05 12:58:05 2005 -0500
    @@ -9,6 +9,8 @@
    * Buddy pounces containing '&' are saved correctly
    * Improved MSN error handling when the servers are unavailable
    * More MSN bug fixes
    + * Fix some leaks
    + * Fix "Find" in the log viewer so that it finds in all logs
    version 1.1.2 (1/20/2005):
    * MSN 'HTTP Method' fixed (Felipe Contreras)
    --- a/src/gtkblist.c Fri Feb 04 00:43:15 2005 -0500
    +++ b/src/gtkblist.c Sat Feb 05 12:58:05 2005 -0500
    @@ -2188,6 +2188,7 @@
    * happened, and the mouse might not still be in the buddy list */
    if(!gtkblist->timeout) {
    gaim_gtk_blist_collapse_contact_cb(NULL, node);
    + gtk_tree_path_free(path);
    return FALSE;
    }
    --- a/src/gtkimhtml.c Fri Feb 04 00:43:15 2005 -0500
    +++ b/src/gtkimhtml.c Sat Feb 05 12:58:05 2005 -0500
    @@ -986,6 +986,8 @@
    g_slist_free(imhtml->im_images);
    if (imhtml->protocol_name)
    g_free(imhtml->protocol_name);
    + if (imhtml->search_string)
    + g_free(imhtml->search_string);
    G_OBJECT_CLASS(parent_class)->finalize (object);
    }
    @@ -3086,6 +3088,7 @@
    gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter,
    gtk_text_buffer_get_mark(imhtml->text_buffer, "search"));
    }
    + g_free(imhtml->search_string);
    imhtml->search_string = g_strdup(text);
    if (gtk_source_iter_forward_search(&iter, imhtml->search_string,
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/src/gtklog.c Sat Feb 05 12:58:05 2005 -0500
    @@ -0,0 +1,479 @@
    +/**
    + * @file gtklog.c GTK+ Log viewer
    + * @ingroup gtkui
    + *
    + * gaim
    + *
    + * Gaim is the legal property of its developers, whose names are too numerous
    + * to list here. Please refer to the COPYRIGHT file distributed with this
    + * source distribution.
    + *
    + * This program is free software; you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation; either version 2 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program; if not, write to the Free Software
    + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    + */
    +#include "internal.h"
    +#include "gtkgaim.h"
    +
    +#include "account.h"
    +#include "util.h"
    +#include "gtkblist.h"
    +#include "gtkimhtml.h"
    +#include "gtklog.h"
    +#include "gtkutils.h"
    +#include "log.h"
    +
    +static GHashTable *log_viewers = NULL;
    +static void populate_log_tree(GaimGtkLogViewer *lv);
    +static GaimGtkLogViewer *syslog_viewer = NULL;
    +
    +struct log_viewer_hash_t {
    + char *screenname;
    + GaimAccount *account;
    +};
    +
    +static guint log_viewer_hash(gconstpointer data)
    +{
    + const struct log_viewer_hash_t *viewer = data;
    + return g_str_hash(viewer->screenname) + g_str_hash(gaim_account_get_username(viewer->account));
    +
    +}
    +
    +static gint log_viewer_equal(gconstpointer y, gconstpointer z)
    +{
    + const struct log_viewer_hash_t *a, *b;
    + int ret;
    + char *normal;
    +
    + a = y;
    + b = z;
    +
    + normal = g_strdup(gaim_normalize(a->account, a->screenname));
    + ret = (a->account == b->account) &&
    + !strcmp(normal, gaim_normalize(b->account, b->screenname));
    + g_free(normal);
    + return ret;
    +}
    +
    +static void search_cb(GtkWidget *button, GaimGtkLogViewer *lv)
    +{
    + const char *search_term = gtk_entry_get_text(GTK_ENTRY(lv->entry));
    + GList *logs;
    + GdkCursor *cursor = gdk_cursor_new(GDK_WATCH);
    +
    + if (lv->search)
    + g_free(lv->search);
    +
    + gtk_tree_store_clear(lv->treestore);
    + if (strlen(search_term) == 0) {/* reset the tree */
    + populate_log_tree(lv);
    + lv->search = NULL;
    + gtk_imhtml_search_clear(GTK_IMHTML(lv->imhtml));
    + return;
    + }
    +
    + lv->search = g_strdup(search_term);
    +
    + gdk_window_set_cursor(lv->window->window, cursor);
    + while (gtk_events_pending())
    + gtk_main_iteration();
    + gdk_cursor_unref(cursor);
    +
    + for (logs = lv->logs; logs != NULL; logs = logs->next) {
    + char *read = gaim_log_read((GaimLog*)logs->data, NULL);
    + if (gaim_strcasestr(read, search_term)) {
    + GtkTreeIter iter;
    + GaimLog *log = logs->data;
    + char title[64];
    + char *title_utf8; /* temporary variable for utf8 conversion */
    + strftime(title, sizeof(title), "%c", localtime(&log->time));
    + title_utf8 = gaim_utf8_try_convert(title);
    + strncpy(title, title_utf8, sizeof(title));
    + g_free(title_utf8);
    + gtk_tree_store_append (lv->treestore, &iter, NULL);
    + gtk_tree_store_set(lv->treestore, &iter,
    + 0, title,
    + 1, log, -1);
    + }
    + g_free(read);
    + }
    +
    +
    + cursor = gdk_cursor_new(GDK_LEFT_PTR);
    + gdk_window_set_cursor(lv->window->window, cursor);
    + gdk_cursor_unref(cursor);
    +}
    +
    +static gboolean destroy_cb(GtkWidget *w, gint resp, struct log_viewer_hash_t *ht) {
    + GaimGtkLogViewer *lv = syslog_viewer;
    +
    + if(ht != NULL){
    + lv = g_hash_table_lookup(log_viewers, ht);
    + g_hash_table_remove(log_viewers, ht);
    + g_free(ht->screenname);
    + g_free(ht);
    + } else
    + syslog_viewer = NULL;
    +
    + while (lv->logs) {
    + GaimLog *log = lv->logs->data;
    + GList *logs2;
    + gaim_log_free(log);
    + logs2 = lv->logs->next;
    + g_list_free_1(lv->logs);
    + lv->logs = logs2;
    + }
    + if (lv->search)
    + g_free(lv->search);
    + g_free(lv);
    + gtk_widget_destroy(w);
    +
    + return TRUE;
    +}
    +#if 0
    +static gboolean destroy_syslog_cb(GtkWidget *w, gint resp, void *cb)
    +{
    + while (syslog_viewer->logs) {
    + GaimLog *log = syslog_viewer->logs->data;
    + GList *logs2;
    + gaim_log_free(log);
    + logs2 = syslog_viewer->logs->next;
    + g_list_free_1(syslog_viewer->logs);
    + syslog_viewer->logs = logs2;
    + }
    + if (syslog_viewer->search)
    + g_free(syslog_viewer->search);
    + g_free(syslog_viewer);
    + syslog_viewer = NULL;
    + gtk_widget_destroy(w);
    +
    + return TRUE;
    +}
    +#endif
    +static void log_select_cb(GtkTreeSelection *sel, GaimGtkLogViewer *viewer) {
    + GtkTreeIter iter;
    + GValue val = { 0, };
    + GtkTreeModel *model = GTK_TREE_MODEL(viewer->treestore);
    + GaimLog *log = NULL;
    + GaimLogReadFlags flags;
    + char *read = NULL;
    + char time[64];
    +
    + char *title;
    + char *title_utf8; /* temporary variable for utf8 conversion */
    +
    + if (! gtk_tree_selection_get_selected (sel, &model, &iter))
    + return;
    + gtk_tree_model_get_value (model, &iter, 1, &val);
    + log = g_value_get_pointer(&val);
    + g_value_unset(&val);
    +
    + if (!log)
    + return;
    +
    + read = gaim_log_read(log, &flags);
    + viewer->flags = flags;
    + strftime(time, sizeof(time), "%c", localtime(&log->time));
    + title = g_strdup_printf("%s - %s", log->name, time);
    + title_utf8 = gaim_utf8_try_convert(title);
    + g_free(title);
    + title = title_utf8;
    + gtk_window_set_title(GTK_WINDOW(viewer->window), title);
    + gtk_imhtml_clear(GTK_IMHTML(viewer->imhtml));
    + gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
    + GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
    + ((flags & GAIM_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0));
    +
    + if (viewer->search)
    + {
    + gtk_imhtml_search_clear(GTK_IMHTML(viewer->imhtml));
    + gtk_imhtml_search_find(GTK_IMHTML(viewer->imhtml), viewer->search);
    + }
    +
    + g_free(read);
    + g_free(title);
    +}
    +
    +/* I want to make this smarter, but haven't come up with a cool algorithm to do so, yet.
    + * I want the tree to be divided into groups like "Today," "Yesterday," "Last week,"
    + * "August," "2002," etc. based on how many conversation took place in each subdivision.
    + *
    + * For now, I'll just make it a flat list.
    + */
    +static void populate_log_tree(GaimGtkLogViewer *lv)
    + /* Logs are made from trees in real life.
    + This is a tree made from logs */
    +{
    + char month[30];
    + char title[64];
    + char prev_top_month[30];
    + char *utf8_tmp; /* temporary variable for utf8 conversion */
    + GtkTreeIter toplevel, child;
    + GList *logs = lv->logs;
    + while (logs) {
    + GaimLog *log = logs->data;
    +
    + strftime(month, sizeof(month), "%B %Y", localtime(&log->time));
    + strftime(title, sizeof(title), "%c", localtime(&log->time));
    +
    + /* do utf8 conversions */
    + utf8_tmp = gaim_utf8_try_convert(month);
    + strncpy(month, utf8_tmp, sizeof(month));
    + g_free(utf8_tmp);
    + utf8_tmp = gaim_utf8_try_convert(title);
    + strncpy(title, utf8_tmp, sizeof(title));
    + g_free(utf8_tmp);
    +
    + if (strncmp(month, prev_top_month, sizeof(month)) != 0) {
    + /* top level */
    + gtk_tree_store_append(lv->treestore, &toplevel, NULL);
    + gtk_tree_store_set(lv->treestore, &toplevel, 0, month, 1, NULL, -1);
    +
    + /* sub */
    + gtk_tree_store_append(lv->treestore, &child, &toplevel);
    + gtk_tree_store_set(lv->treestore, &child, 0, title, 1, log, -1);
    +
    + strncpy(prev_top_month, month, sizeof(prev_top_month));
    + } else {
    + gtk_tree_store_append(lv->treestore, &child, &toplevel);
    + gtk_tree_store_set(lv->treestore, &child, 0, title, 1, log, -1);
    + }
    +
    + logs = logs->next;
    + }
    +}
    +
    +void gaim_gtk_log_show(GaimLogType type, const char *screenname, GaimAccount *account) {
    + /* if (log_viewers && g_hash_table */
    + GtkWidget *hbox, *vbox;
    + GdkPixbuf *pixbuf, *scale;
    + GtkCellRenderer *rend;
    + GtkTreeViewColumn *col;
    + GaimGtkLogViewer *lv = NULL;
    + GtkTreeSelection *sel;
    + GtkWidget *icon, *label, *pane, *sw, *button;
    + GList *logs;
    + char *text ,*ttext;
    + struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1);
    +
    + ht->screenname = g_strdup(screenname);
    + ht->account = account;
    +
    + if (!log_viewers) {
    + log_viewers = g_hash_table_new(log_viewer_hash, log_viewer_equal);
    + } else if ((lv = g_hash_table_lookup(log_viewers, ht))) {
    + gtk_window_present(GTK_WINDOW(lv->window));
    + return;
    + }
    +
    + lv = g_new0(GaimGtkLogViewer, 1);
    + lv->logs = logs = gaim_log_get_logs(type, screenname, account);
    + g_hash_table_insert(log_viewers, ht, lv);
    +
    + /* Window ***********/
    + lv->window = gtk_dialog_new_with_buttons(screenname, NULL, 0,
    + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
    + gtk_container_set_border_width (GTK_CONTAINER(lv->window), 6);
    + gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
    + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0);
    + g_signal_connect(G_OBJECT(lv->window), "response",
    + G_CALLBACK(destroy_cb), ht);
    +
    + hbox = gtk_hbox_new(FALSE, 6);
    + gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
    + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), hbox, FALSE, FALSE, 0);
    +
    + /* Icon *************/
    + pixbuf = create_prpl_icon(account);
    + scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
    + icon = gtk_image_new_from_pixbuf(scale);
    + gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0);
    + g_object_unref(G_OBJECT(pixbuf));
    + g_object_unref(G_OBJECT(scale));
    +
    + /* Label ************/
    + label = gtk_label_new(NULL);
    +
    + ttext = g_strdup_printf(_("Conversations with %s"), screenname);
    + text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>",ttext);
    + g_free(ttext);
    +
    + gtk_label_set_markup(GTK_LABEL(label), text);
    + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    + g_free(text);
    +
    + /* Pane *************/
    + pane = gtk_hpaned_new();
    + gtk_container_set_border_width(GTK_CONTAINER(pane), 6);
    + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), pane, TRUE, TRUE, 0);
    +
    + /* List *************/
    + sw = gtk_scrolled_window_new (NULL, NULL);
    + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
    + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
    + gtk_paned_add1(GTK_PANED(pane), sw);
    + lv->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
    + lv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (lv->treestore));
    + rend = gtk_cell_renderer_text_new();
    + col = gtk_tree_view_column_new_with_attributes ("time", rend, "markup", 0, NULL);
    + gtk_tree_view_append_column (GTK_TREE_VIEW(lv->treeview), col);
    + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (lv->treeview), FALSE);
    + gtk_container_add (GTK_CONTAINER (sw), lv->treeview);
    + populate_log_tree(lv);
    +
    + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (lv->treeview));
    + g_signal_connect (G_OBJECT (sel), "changed",
    + G_CALLBACK (log_select_cb),
    + lv);
    +
    + /* Viewer ************/
    + vbox = gtk_vbox_new(FALSE, 6);
    + gtk_paned_add2(GTK_PANED(pane), vbox);
    + sw = gtk_scrolled_window_new(NULL, NULL);
    + gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
    + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
    + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
    + lv->imhtml = gtk_imhtml_new(NULL, NULL);
    + gtk_widget_set_name(lv->imhtml, "gaim_gtklog_imhtml");
    + gtk_container_add(GTK_CONTAINER(sw), lv->imhtml);
    + gaim_setup_imhtml(lv->imhtml);
    + gtk_widget_set_size_request(lv->imhtml, 320, 200);
    +
    + /* Search box **********/
    + hbox = gtk_hbox_new(FALSE, 6);
    + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    + lv->entry = gtk_entry_new();
    + gtk_box_pack_start(GTK_BOX(hbox), lv->entry, TRUE, TRUE, 0);
    + g_signal_connect(GTK_ENTRY(lv->entry), "activate",
    + G_CALLBACK (search_cb), lv);
    + button = gtk_button_new_from_stock(GTK_STOCK_FIND);
    + g_signal_connect (GTK_BUTTON (button), "activate",
    + G_CALLBACK (search_cb), lv);
    + g_signal_connect (GTK_BUTTON (button), "clicked",
    + G_CALLBACK (search_cb), lv);
    + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
    + gaim_set_accessible_label (lv->treeview, label);
    +
    + gtk_widget_show_all(lv->window);
    +}
    +
    +void gaim_gtk_syslog_show()
    +{
    + GtkWidget *hbox, *vbox;
    + GtkCellRenderer *rend;
    + GtkTreeViewColumn *col;
    + GtkTreeSelection *sel;
    + GtkWidget *label, *pane, *sw, *button;
    + char *text;
    + GList *accounts = NULL;
    +
    + if(syslog_viewer){
    + gtk_window_present(GTK_WINDOW(syslog_viewer->window));
    + return;
    + }
    +
    + syslog_viewer = g_new0(GaimGtkLogViewer, 1);
    +
    + for(accounts = gaim_accounts_get_all(); accounts != NULL;
    + accounts = accounts->next) {
    + GList *logs;
    + GaimAccount *account = (GaimAccount *)accounts->data;
    + if(!gaim_find_prpl(gaim_account_get_protocol_id(account)))
    + continue;
    +
    + logs = gaim_log_get_system_logs(account);
    + syslog_viewer->logs = g_list_concat(syslog_viewer->logs, logs);
    + }
    + syslog_viewer->logs = g_list_sort(syslog_viewer->logs, gaim_log_compare);
    +
    + /* Window ***********/
    + syslog_viewer->window = gtk_dialog_new_with_buttons(_("System Log"), NULL, 0,
    + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
    + gtk_container_set_border_width (GTK_CONTAINER(syslog_viewer->window), 6);
    + gtk_dialog_set_has_separator(GTK_DIALOG(syslog_viewer->window), FALSE);
    + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(syslog_viewer->window)->vbox), 0);
    + g_signal_connect(G_OBJECT(syslog_viewer->window), "response",
    + G_CALLBACK(destroy_cb), NULL);
    +
    + hbox = gtk_hbox_new(FALSE, 6);
    + gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
    + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(syslog_viewer->window)->vbox), hbox,
    + FALSE, FALSE, 0);
    +
    + /* Label ************/
    + label = gtk_label_new(NULL);
    + text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>",
    + _("System Log"));
    + gtk_label_set_markup(GTK_LABEL(label), text);
    + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    + g_free(text);
    +
    + /* Pane *************/
    + pane = gtk_hpaned_new();
    + gtk_container_set_border_width(GTK_CONTAINER(pane), 6);
    + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(syslog_viewer->window)->vbox), pane,
    + TRUE, TRUE, 0);
    +
    + /* List *************/
    + sw = gtk_scrolled_window_new (NULL, NULL);
    + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
    + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
    + gtk_paned_add1(GTK_PANED(pane), sw);
    + syslog_viewer->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
    + syslog_viewer->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (syslog_viewer->treestore));
    + rend = gtk_cell_renderer_text_new();
    + col = gtk_tree_view_column_new_with_attributes ("time", rend, "markup", 0, NULL);
    + gtk_tree_view_append_column (GTK_TREE_VIEW(syslog_viewer->treeview), col);
    + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (syslog_viewer->treeview), FALSE);
    + gtk_container_add (GTK_CONTAINER (sw), syslog_viewer->treeview);
    +
    + gtk_widget_set_size_request(syslog_viewer->treeview, 170, 200);
    + populate_log_tree(syslog_viewer);
    +
    + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (syslog_viewer->treeview));
    + g_signal_connect (G_OBJECT (sel), "changed",
    + G_CALLBACK (log_select_cb),
    + syslog_viewer);
    +
    + /* Viewer ************/
    + vbox = gtk_vbox_new(FALSE, 6);
    + gtk_paned_add2(GTK_PANED(pane), vbox);
    + sw = gtk_scrolled_window_new(NULL, NULL);
    + gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
    + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
    + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
    + syslog_viewer->imhtml = gtk_imhtml_new(NULL, NULL);
    + gtk_widget_set_name(syslog_viewer->imhtml, "gaim_gtklog_imhtml");
    + gtk_container_add(GTK_CONTAINER(sw), syslog_viewer->imhtml);
    + gaim_setup_imhtml(syslog_viewer->imhtml);
    + gtk_widget_set_size_request(syslog_viewer->imhtml, 400, 200);
    +
    + /* Search box **********/
    + hbox = gtk_hbox_new(FALSE, 6);
    + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    + syslog_viewer->entry = gtk_entry_new();
    + gtk_box_pack_start(GTK_BOX(hbox), syslog_viewer->entry, TRUE, TRUE, 0);
    + g_signal_connect (GTK_ENTRY (syslog_viewer->entry), "activate",
    + G_CALLBACK (search_cb),
    + syslog_viewer);
    + button = gtk_button_new_from_stock(GTK_STOCK_FIND);
    + g_signal_connect (GTK_BUTTON (button), "activate",
    + G_CALLBACK (search_cb),
    + syslog_viewer);
    + g_signal_connect (GTK_BUTTON (button), "clicked",
    + G_CALLBACK (search_cb),
    + syslog_viewer);
    + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
    +
    + gtk_widget_show_all(syslog_viewer->window);
    +}
    --- a/src/protocols/msn/object.c Fri Feb 04 00:43:15 2005 -0500
    +++ b/src/protocols/msn/object.c Sat Feb 05 12:58:05 2005 -0500
    @@ -110,6 +110,9 @@
    if (obj->location != NULL)
    g_free(obj->location);
    + if (obj->real_location != NULL)
    + g_free(obj->real_location);
    +
    if (obj->friendly != NULL)
    g_free(obj->friendly);
    --- a/src/protocols/oscar/oscar.c Fri Feb 04 00:43:15 2005 -0500
    +++ b/src/protocols/oscar/oscar.c Sat Feb 05 12:58:05 2005 -0500
    @@ -58,8 +58,6 @@
    #define OSCAR_CONNECT_STEPS 6
    #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
    -static GaimPlugin *my_protocol = NULL;
    -
    static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_DIRECTIM | AIM_CAPS_SENDFILE | AIM_CAPS_INTEROPERATE | AIM_CAPS_ICHAT;
    static int caps_icq = AIM_CAPS_BUDDYICON | AIM_CAPS_DIRECTIM | AIM_CAPS_SENDFILE | AIM_CAPS_ICQUTF8 | AIM_CAPS_INTEROPERATE | AIM_CAPS_ICHAT;
    @@ -7473,8 +7471,6 @@
    option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
    prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
    -
    - my_protocol = plugin;
    }
    GAIM_INIT_PLUGIN(oscar, init_plugin, info);