Mercurial > pidgin
changeset 14799:e908bff64af5
[gaim-migrate @ 17564]
Revert the changes from 17036. The log-displaying signal has a GaimGtkLogViewer argument, and gaim-encryption uses it. Accessor methods would be another way to solve this, but I don't really want to risk breaking things more.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 23 Oct 2006 01:07:27 +0000 |
| parents | a413bcb6f19a |
| children | c678034a7e3e |
| files | ChangeLog.API gtk/gtklog.c gtk/gtklog.h |
| diffstat | 3 files changed, 21 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sun Oct 22 07:04:28 2006 +0000 +++ b/ChangeLog.API Mon Oct 23 01:07:27 2006 +0000 @@ -198,7 +198,6 @@ * gaim_conversation_get_send_history(), and send_history from GaimConversation * Removed ui_ops from GaimBuddyList. Use gaim_blist_get_ui_ops() instead - * GaimGtkLogViewer hidden... You weren't using it anyway. * GaimGtkConversation: dialogs (dialogs.search moved to GaimGtkWindow) * gaim_show_xfer_dialog: Use gaim_gtk_xfer_dialog_show(NULL) instead. * GaimGtkRoomlistDialog: Nothing used it outside of the file it was in.
--- a/gtk/gtklog.c Sun Oct 22 07:04:28 2006 +0000 +++ b/gtk/gtklog.c Mon Oct 23 01:07:27 2006 +0000 @@ -34,25 +34,6 @@ #include "notify.h" #include "util.h" -typedef struct _GaimGtkLogViewer GaimGtkLogViewer; - -/** - * A GTK+ Log Viewer. You can look at logs with it. - */ -struct _GaimGtkLogViewer { - GList *logs; /**< The list of logs viewed in this viewer */ - - GtkWidget *window; /**< The viewer's window */ - GtkTreeStore *treestore; /**< The treestore containing said logs */ - GtkWidget *treeview; /**< The treeview representing said treestore */ - GtkWidget *imhtml; /**< The imhtml to display said logs */ - GtkWidget *entry; /**< The search entry, in which search terms - * are entered */ - GaimLogReadFlags flags; /**< The most recently used log flags */ - char *search; /**< The string currently being searched for */ - GtkWidget *label; /**< The label at the top of the log viewer */ -}; - static GHashTable *log_viewers = NULL; static void populate_log_tree(GaimGtkLogViewer *lv); static GaimGtkLogViewer *syslog_viewer = NULL;
--- a/gtk/gtklog.h Sun Oct 22 07:04:28 2006 +0000 +++ b/gtk/gtklog.h Mon Oct 23 01:07:27 2006 +0000 @@ -30,6 +30,27 @@ #include "account.h" +typedef struct _GaimGtkLogViewer GaimGtkLogViewer; + +/** + * A GTK+ Log Viewer. You can look at logs with it. + */ +struct _GaimGtkLogViewer { + GList *logs; /**< The list of logs viewed in this viewer */ + + GtkWidget *window; /**< The viewer's window */ + GtkTreeStore *treestore; /**< The treestore containing said logs */ + GtkWidget *treeview; /**< The treeview representing said treestore */ + GtkWidget *imhtml; /**< The imhtml to display said logs */ + GtkWidget *entry; /**< The search entry, in which search terms + * are entered */ + GaimLogReadFlags flags; /**< The most recently used log flags */ + char *search; /**< The string currently being searched for */ + GtkWidget *label; /**< The label at the top of the log viewer */ +}; + + + void gaim_gtk_log_show(GaimLogType type, const char *screenname, GaimAccount *account); void gaim_gtk_log_show_contact(GaimContact *contact);