[Ayttm-commits] CVS: ayttm/src chat_room.c,1.42,1.43 chat_window.c,1.41,1.42 smileys.c,1.13,1.14

[Philip S Tellis <address@hidden>]

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

Modified Files:
        chat_room.c chat_window.c smileys.c 
Log Message:
check for get_smileys before calling - so that modules can define it as
null


Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- chat_room.c 28 Jan 2003 10:35:35 -0000      1.42
+++ chat_room.c 30 Jan 2003 05:27:49 -0000      1.43
@@ -689,7 +689,10 @@
                        gdk_window_raise(chat_room->window->window);
                 
        }
-       temp_message = eb_smilify(g_strdup(message), 
RUN_SERVICE(chat_room->chat_room_account)->get_smileys());
+       if(RUN_SERVICE(chat_room->chat_room_account)->get_smileys)
+               temp_message = eb_smilify(g_strdup(message), 
RUN_SERVICE(chat_room->chat_room_account)->get_smileys());
+       else
+               temp_message = g_strdup(message);
        link_message = linkify(temp_message);
        
        gtk_eb_html_add(EXT_GTK_TEXT(chat_room->conversation), buff,0,0,0 );

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- chat_window.c       29 Jan 2003 19:19:22 -0000      1.41
+++ chat_window.c       30 Jan 2003 05:27:49 -0000      1.42
@@ -477,7 +477,10 @@
                data->hist_pos=NULL;
        }
 
-       temp_message = eb_smilify(strdup(text), 
RUN_SERVICE(data->local_user)->get_smileys());
+       if(RUN_SERVICE(data->local_user)->get_smileys)
+               temp_message = eb_smilify(strdup(text), 
RUN_SERVICE(data->local_user)->get_smileys());
+       else
+               temp_message = g_strdup(message);
        link_message = linkify(temp_message);
        g_free(temp_message);
 
@@ -1167,7 +1170,10 @@
 
        /* end inbound filters */
 
-       temp_message = eb_smilify(message, RUN_SERVICE(account)->get_smileys());
+       if(RUN_SERVICE(account)->get_smileys)
+               temp_message = eb_smilify(message, 
RUN_SERVICE(account)->get_smileys());
+       else
+               temp_message = g_strdup(message);
        message = linkify(temp_message);
        g_free(temp_message);
 

Index: smileys.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/smileys.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smileys.c   24 Jan 2003 16:38:20 -0000      1.13
+++ smileys.c   30 Jan 2003 05:27:49 -0000      1.14
@@ -388,7 +388,7 @@
                return;
        }
        
-       if (account && RUN_SERVICE(account))
+       if (account && RUN_SERVICE(account)->get_smileys)
                smileys = RUN_SERVICE(account)->get_smileys();
        else 
                return;