[Ayttm-commits] CVS: ayttm/src chat_window.c,1.31,1.32 edit_account_window.c,1.8,1.9 edit_contact_window.c,1.7,1.8 extgtktext.c,1.8,1.9 log_window.c,1.11,1.12 log_window.h,1.3,1.4

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv2642/src

Modified Files:
        chat_window.c edit_account_window.c edit_contact_window.c 
        extgtktext.c log_window.c log_window.h 
Log Message:
Fix bug: font ignoring prefs weren't ignored on
Log view nor on conv. restoring

+Cosmetics



Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- chat_window.c       24 Jan 2003 07:06:41 -0000      1.31
+++ chat_window.c       24 Jan 2003 10:37:17 -0000      1.32
@@ -46,6 +46,7 @@
 #include "contact_actions.h"
 #include "smileys.h"
 #include "service.h"
+#include "log_window.h"
 #ifdef HAVE_ISPELL
 #include "gtkspell.h"
 #endif
@@ -1428,9 +1429,9 @@
                                gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
buff+strlen("<HR WIDTH=\"100%%\"><P ALIGN=\"CENTER\">"),0,0,0);
                        else if(!strncmp(buff,"<P ALIGN=\"CENTER\">", 
strlen("<P ALIGN=\"CENTER\">")))
                                gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
buff+strlen("<P ALIGN=\"CENTER\">"),0,0,0);
-                       else
-                               gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), buff, 
0,0,0);
-
+                       else {
+                               log_parse_and_add(buff, cw->chat);
+                       }
 
                        gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), "<br>",0,0,0);
 
@@ -1489,11 +1490,17 @@
                                name[buff3-buff2] = '\0';
                                g_snprintf(buff, BUF_SIZE, "<FONT 
COLOR=\"%s\"><B>%s </B></FONT>",color, name);
                                gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
buff,0,0,0);
-                               gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
buff3,0,0,0);
+                               gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), buff3,
+                                               
iGetLocalPref("do_ignore_back"), 
+                                               
iGetLocalPref("do_ignore_fore"), 
+                                               
iGetLocalPref("do_ignore_font"));
                                gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
"<br>",0,0,0);
                        } else {
                                /* hmm, no ':' must be a non start/blank line */
-                               
gtk_eb_html_add(EXT_GTK_TEXT(cw->chat),buff2,0,0,0);
+                               gtk_eb_html_add(EXT_GTK_TEXT(cw->chat),buff2,   
+                                               
iGetLocalPref("do_ignore_back"), 
+                                               
iGetLocalPref("do_ignore_fore"), 
+                                               
iGetLocalPref("do_ignore_font"));
                                gtk_eb_html_add(EXT_GTK_TEXT(cw->chat), 
"<br>",0,0,0);
                        }
                }

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- edit_account_window.c       18 Jan 2003 12:38:53 -0000      1.8
+++ edit_account_window.c       24 Jan 2003 10:37:17 -0000      1.9
@@ -52,16 +52,14 @@
 
        gl = find_grouplist_by_name(COMBO_TEXT(group));
 
-       if(!gl)
-       {
+       if(!gl) {
                add_group(COMBO_TEXT(group));
                gl = find_grouplist_by_name(COMBO_TEXT(group));
        }
 
        con = find_contact_in_group_by_nick(COMBO_TEXT(nick), gl);
 
-       if(!con)
-       {
+       if(!con) {
                con = add_new_contact(COMBO_TEXT(group), COMBO_TEXT(nick), 
account->service_id);
        }
 
@@ -91,12 +89,11 @@
        g = find_grouplist_by_name(group);
 
        if(g)
-       node = g->members;
+               node = g->members;
 
-       while(node)
-       {
-       newlist = g_list_insert_sorted(newlist, ((struct contact 
*)node->data)->nick, strcasecmp_glist);
-       node = node->next;
+       while(node) {
+               newlist = g_list_insert_sorted(newlist, ((struct contact 
*)node->data)->nick, strcasecmp_glist);
+               node = node->next;
        }
 
        return newlist;
@@ -124,8 +121,7 @@
 
        account = ea;
 
-       if(!window_open)
-       {
+       if(!window_open) {
                GtkWidget *vbox;
                GtkWidget *hbox;
                GtkWidget *hbox2;

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- edit_contact_window.c       16 Jan 2003 13:11:01 -0000      1.7
+++ edit_contact_window.c       24 Jan 2003 10:37:17 -0000      1.8
@@ -62,8 +62,7 @@
 void edit_contact_window_new( struct contact * c )
 {
        gchar buff[1024];
-       if( !window_open )
-       {
+       if( !window_open ) {
                GtkWidget * vbox = gtk_vbox_new( FALSE, 5 );
                GtkWidget * hbox = gtk_hbox_new( FALSE, 0 );
                GtkWidget * hbox2;
@@ -74,7 +73,7 @@
                GtkWidget * table;
                GtkWidget * separator;
                GdkPixmap *icon;
-      GdkBitmap *mask;
+               GdkBitmap *mask;
                GList * list;
                edit_contact_window = gtk_window_new(GTK_WINDOW_DIALOG);
                gtk_widget_realize(edit_contact_window);
@@ -160,50 +159,50 @@
                
                /*Ok Button*/
    
-       icon = gdk_pixmap_create_from_xpm_d( edit_contact_window->window, 
&mask, NULL, tb_edit_xpm);
-       iconwid = gtk_pixmap_new( icon, mask );
-       label = gtk_label_new(_("Apply"));
-   
-       gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-   
-       gtk_widget_show(iconwid);
-       gtk_widget_show(label);
-   
-       button = gtk_button_new();
-   
-       gtk_signal_connect(GTK_OBJECT(button), "clicked", 
-                                          GTK_SIGNAL_FUNC(ok_callback), NULL );
-   
-       gtk_container_add (GTK_CONTAINER (button), hbox);
-       gtk_widget_show(hbox);
-   
-       gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-       gtk_widget_show(button);
+               icon = gdk_pixmap_create_from_xpm_d( 
edit_contact_window->window, &mask, NULL, tb_edit_xpm);
+               iconwid = gtk_pixmap_new( icon, mask );
+               label = gtk_label_new(_("Apply"));
+
+               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
+               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+
+               gtk_widget_show(iconwid);
+               gtk_widget_show(label);
+
+               button = gtk_button_new();
+
+               gtk_signal_connect(GTK_OBJECT(button), "clicked", 
+                                                  
GTK_SIGNAL_FUNC(ok_callback), NULL );
+
+               gtk_container_add (GTK_CONTAINER (button), hbox);
+               gtk_widget_show(hbox);
+
+               gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
+               gtk_widget_show(button);
                
                /*Cancel Button*/
       
-      hbox = gtk_hbox_new(FALSE, 5);
-      icon = gdk_pixmap_create_from_xpm_d( edit_contact_window->window, &mask, 
NULL, cancel_xpm);
-      iconwid = gtk_pixmap_new( icon, mask );
-      label = gtk_label_new(_("Cancel"));
-      
-      gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-      gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-      
-      gtk_widget_show(iconwid);
-      gtk_widget_show(label);
-      
-      button = gtk_button_new();
-      
-      gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-                                                                 
GTK_SIGNAL_FUNC(gtk_widget_destroy),
-                                                                 
GTK_OBJECT(edit_contact_window));
-      gtk_container_add (GTK_CONTAINER (button), hbox);                
-      gtk_widget_show(hbox);     
-      
-      gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-      gtk_widget_show(button);
+               hbox = gtk_hbox_new(FALSE, 5);
+               icon = gdk_pixmap_create_from_xpm_d( 
edit_contact_window->window, &mask, NULL, cancel_xpm);
+               iconwid = gtk_pixmap_new( icon, mask );
+               label = gtk_label_new(_("Cancel"));
+
+               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
+               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+
+               gtk_widget_show(iconwid);
+               gtk_widget_show(label);
+
+               button = gtk_button_new();
+
+               gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+                                                                         
GTK_SIGNAL_FUNC(gtk_widget_destroy),
+                                                                         
GTK_OBJECT(edit_contact_window));
+               gtk_container_add (GTK_CONTAINER (button), hbox);               
+               gtk_widget_show(hbox);     
+
+               gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
+               gtk_widget_show(button);
                
                /*Buttons End*/
                
@@ -228,8 +227,6 @@
                gtk_widget_show(edit_contact_window);
        }
        
-       //gtk_entry_set_text(GTK_ENTRY(nick), c->nick );
-       //gtk_combo_set_value_in_list(GTK_COMBO(service_list), c-> 
default_chatb, 0 );
        g_snprintf(buff,1024,_("Edit Properties for %s"), c->nick);
        gtk_window_set_title(GTK_WINDOW(edit_contact_window), buff ); 
        eb_icon(edit_contact_window->window);

Index: extgtktext.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/extgtktext.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- extgtktext.c        21 Jan 2003 01:11:01 -0000      1.8
+++ extgtktext.c        24 Jan 2003 10:37:17 -0000      1.9
@@ -2555,7 +2555,7 @@
   
   if (adjustment == text->hadj)
     {
-      eb_debug (DBG_CORE, "extgtktext: horizontal scrolling not implemented");
+      eb_debug (DBG_CORE, "extgtktext: horizontal scrolling not 
implemented\n");
     }
   else
     {

Index: log_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- log_window.c        16 Jan 2003 17:28:26 -0000      1.11
+++ log_window.c        24 Jan 2003 10:37:17 -0000      1.12
@@ -89,9 +89,8 @@
   /* walk down the list and add the test */
   h = gl;  
   while (h != NULL) {
-    if (h->data != NULL) {
-      gtk_eb_html_add(EXT_GTK_TEXT(lw->html_display), (gchar*)h->data,0,0,0);
-    }
+    if (h->data != NULL) 
+           log_parse_and_add(h->data, lw->html_display);
     h = g_slist_next(h);
   }
 
@@ -425,4 +424,38 @@
   gtk_clist_select_row(GTK_CLIST(lw->date_list), 0, 0);
 
   return lw;
+}
+
+void log_parse_and_add(char *buff, void *text) 
+{
+       char *buff2 = NULL;
+       /* ME */
+       if (!strncmp(buff,"<P> <FONT COLOR=\"#", strlen("<P> <FONT COLOR=\"#")) 
+       && isdigit(buff[strlen("<P> <FONT COLOR=\"#??????\"><B>1")])
+       && strstr(buff, "/FONT> ")) {
+               /* seems to be a beginning of line... */
+               buff2 = strstr(buff, "/FONT> ")+strlen("/FONT>");
+               buff2[0] = '\0';
+               buff2++;
+               gtk_eb_html_add(EXT_GTK_TEXT(text), buff,0,0,0);
+               gtk_eb_html_add(EXT_GTK_TEXT(text), buff2,
+                               iGetLocalPref("do_ignore_back"),
+                               iGetLocalPref("do_ignore_fore"),
+                               iGetLocalPref("do_ignore_font"));
+       } /* OTHER */
+       else if (!strncmp(buff,"<P> <B><FONT COLOR=\"#", strlen("<P> <B><FONT 
COLOR=\"#")) 
+       && isdigit(buff[strlen("<P> <B><FONT COLOR=\"#??????\">1")])
+       && strstr(buff, "/FONT> </B> ")) {
+               /* seems to be a beginning of line... */
+               buff2 = strstr(buff, "/FONT> </B> ")+strlen("/FONT> </B>");
+               buff2[0] = '\0';
+               buff2++;
+               gtk_eb_html_add(EXT_GTK_TEXT(text), buff,0,0,0);
+               gtk_eb_html_add(EXT_GTK_TEXT(text), buff2,
+                               iGetLocalPref("do_ignore_back"),
+                               iGetLocalPref("do_ignore_fore"),
+                               iGetLocalPref("do_ignore_font"));
+       } else {
+               gtk_eb_html_add(EXT_GTK_TEXT(text), buff,0,0,0);
+       }
 }

Index: log_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log_window.h        20 Jan 2003 20:33:18 -0000      1.3
+++ log_window.h        24 Jan 2003 10:37:17 -0000      1.4
@@ -46,5 +46,5 @@
 
 //log_window* eb_log_window_new(struct _chat_window* cw);
 log_window* eb_log_window_new(struct contact* rc);
-
+void log_parse_and_add(char *buff, void *text);
 #endif