Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv27415/src
Modified Files:
dialogs.c ui.h conversation.c
Log Message:
log viewer works on chats now. neat. Thanks javabsp.
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- dialogs.c 16 Sep 2002 19:50:52 -0000 1.338
+++ dialogs.c 17 Sep 2002 16:43:59 -0000 1.339
@@ -4107,6 +4107,13 @@
g_free(name);
}
+void chat_show_log(GtkWidget *w, gpointer data)
+{
+ char *name = g_strdup_printf("%s.chat", data);
+ show_log(name);
+ g_free(name);
+}
+
void show_log(char *nm)
{
gchar filename[256];
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ui.h 16 Sep 2002 20:42:17 -0000 1.55
+++ ui.h 17 Sep 2002 16:43:59 -0000 1.56
@@ -430,6 +430,7 @@
extern void show_export_dialog();
extern void show_new_bp(char *, struct gaim_connection *, int, int, struct buddy_pounce *);
extern void conv_show_log(GtkWidget *, gpointer);
+extern void chat_show_log(GtkWidget *, gpointer);
extern void show_log(char *);
extern void show_log_dialog(struct conversation *);
extern void show_fgcolor_dialog(struct conversation *c, GtkWidget *color);
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- conversation.c 16 Sep 2002 08:35:20 -0000 1.377
+++ conversation.c 17 Sep 2002 16:44:00 -0000 1.378
@@ -2281,10 +2281,16 @@
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
state_lock = 0;
- viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- NULL, _("Show Log Viewer"), _("Viewer"),
- viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));
-
+ if (c->is_chat) {
+ viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ NULL, _("Show Log Viewer"), _("Viewer"),
+ viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));
+ } else {
+ viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ NULL, _("Show Log Viewer"), _("Viewer"),
+ viewer_p, GTK_SIGNAL_FUNC(chat_show_log), GINT_TO_POINTER(c->name));
+ }
+
save = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
NULL, _("Save Conversation"),
_("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c);
|