[Gaim-commits] SF.net SVN: gaim: [17564] trunk

[<rl...@us...>]

Revision: 17564
          http://svn.sourceforge.net/gaim/?rev=17564&view=rev
Author:   rlaager
Date:     2006-10-22 18:07:27 -0700 (Sun, 22 Oct 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/ChangeLog.API
    trunk/gtk/gtklog.c
    trunk/gtk/gtklog.h

Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API	2006-10-22 07:04:28 UTC (rev 17563)
+++ trunk/ChangeLog.API	2006-10-23 01:07:27 UTC (rev 17564)
@@ -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.

Modified: trunk/gtk/gtklog.c
===================================================================
--- trunk/gtk/gtklog.c	2006-10-22 07:04:28 UTC (rev 17563)
+++ trunk/gtk/gtklog.c	2006-10-23 01:07:27 UTC (rev 17564)
@@ -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;

Modified: trunk/gtk/gtklog.h
===================================================================
--- trunk/gtk/gtklog.h	2006-10-22 07:04:28 UTC (rev 17563)
+++ trunk/gtk/gtklog.h	2006-10-23 01:07:27 UTC (rev 17564)
@@ -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);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.