[Ayttm-commits] CVS: ayttm/src about.c,1.17,1.18 chat_room.c,1.38,1.39 crash.c,1.10,1.11 main.c,1.17,1.18 status.c,1.35,1.36

[Philip S Tellis <address@hidden>]

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

Modified Files:
        about.c chat_room.c crash.c main.c status.c 
Log Message:
check for NULL account in conference, disable duplicate joined/left message

Index: about.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/about.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- about.c     24 Jan 2003 11:44:05 -0000      1.17
+++ about.c     27 Jan 2003 09:00:35 -0000      1.18
@@ -119,7 +119,7 @@
        GtkStyle        *style = NULL;
        GdkPixmap       *pm = NULL;
        GdkBitmap       *bm = NULL;
-       const char      *versionStr = "Ayttm " VERSION "" RELEASE "\n" __DATE__;
+       const char      *versionStr = "Ayttm " VERSION "-" RELEASE "\n" 
__DATE__;
 
 
        if ( sAboutWindow != NULL )

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- chat_room.c 24 Jan 2003 13:34:41 -0000      1.38
+++ chat_room.c 27 Jan 2003 09:00:35 -0000      1.39
@@ -570,7 +570,8 @@
        {
                eb_chat_room_buddy * ecrb = node->data;
                eb_account *ea = find_account_by_handle(ecrb->handle, 
room->service_id);
-               eb_chat_room_display_status (ea, NULL);
+               if(ea)
+                       eb_chat_room_display_status (ea, NULL);
                room->fellows = l_list_remove(room->fellows, ecrb);
                g_free(ecrb);
        }

Index: crash.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/crash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- crash.c     24 Jan 2003 20:41:31 -0000      1.10
+++ crash.c     27 Jan 2003 09:00:35 -0000      1.11
@@ -215,7 +215,7 @@
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(
-               "Ayttm version %s%s\n"
+               "Ayttm version %s-%s\n"
                "GTK+ version %d.%d.%d\n"
                "Features:%s\n"
                "Operating system: %s\n"

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- main.c      24 Jan 2003 05:25:34 -0000      1.17
+++ main.c      27 Jan 2003 09:00:35 -0000      1.18
@@ -70,7 +70,7 @@
 
 static void eb_cli_ver ()
 {
-       printf("Ayttm v%s%s\n", VERSION, RELEASE);
+       printf("Ayttm v%s-%s\n", VERSION, RELEASE);
        printf("Copyright (C) 2003 The Ayttm team\n");
        printf("Ayttm comes with NO WARRANTY, to the extent permitted"
               " by law.\n");

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- status.c    26 Jan 2003 19:34:45 -0000      1.35
+++ status.c    27 Jan 2003 09:00:35 -0000      1.36
@@ -1203,7 +1203,7 @@
                                        (GtkFunction)update_window_title, 
                                        NULL);
        } else {
-               title = _("Ayttm "VERSION""RELEASE);
+               title = _("Ayttm "VERSION"-"RELEASE);
        }
        
        gtk_window_set_title(GTK_WINDOW(statuswindow), title);
@@ -1791,7 +1791,7 @@
        gtk_widget_show(hbox);
                
         gtk_box_pack_start(GTK_BOX(statusbox), hbox ,FALSE, FALSE,0);
-        gtk_window_set_title(GTK_WINDOW(statuswindow), _("Ayttm 
"VERSION""RELEASE));
+        gtk_window_set_title(GTK_WINDOW(statuswindow), _("Ayttm 
"VERSION"-"RELEASE));
        eb_icon(statuswindow->window);
        gtk_widget_show(statusbox);