[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.73,1.74

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory subversions:/tmp/cvs-serv29805/modules/msn2

Modified Files:
        msn.C 
Log Message:
better gnomemeeting detection


Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- msn.C       19 Mar 2003 16:42:21 -0000      1.73
+++ msn.C       19 Mar 2003 17:29:08 -0000      1.74
@@ -1987,22 +1987,41 @@
 {
        FILE *test=NULL;
        char buf[1024];
+       int callto_supported = 0;
+       
        if(!ip)
                return;
        test=popen("gnomemeeting --version 2>&1","r");
-       if (test==NULL)
-               do_error_dialog("You have no gnomemeeting installed or it isn't 
in your PATH.","Cannot run gnomemeeting");
-       else {
-               fgets(buf, sizeof(buf), test);
-               pclose(test);
-               if(strstr(buf,"GnomeMeeting")) {
-                       snprintf(buf,1024,"gnomemeeting -c callto://%s",ip);
-                       /* should check version... 0.85, for example doesn't 
handle -c */
-                       system(buf);
-               } else {
-                       do_error_dialog("You have no gnomemeeting installed or 
it isn't in your PATH.","Cannot run gnomemeeting");              
-               }       
+       if (test==NULL) {
+               do_error_dialog(_("Cannot run gnomemeeting: presence test 
failed."),_("Cannot run gnomemeeting"));
+               return;
+       }
+       fgets(buf, sizeof(buf), test);
+       pclose(test);
+       if(!strstr(buf,"GnomeMeeting")) {
+               do_error_dialog(_("You have no gnomemeeting installed or it 
isn't in your PATH."),("Cannot run gnomemeeting"));         
+               return;
+       }       
+       test=NULL;
+       test=popen("gnomemeeting --help 2>&1","r");
+       if (test==NULL) {
+               do_error_dialog(_("Cannot run gnomemeeting: presence test 
failed."),("Cannot run gnomemeeting"));
+               return;
+       }
+       while ((fgets(buf, sizeof(buf), test)) != NULL) {
+               if(strstr(buf, "--callto") != NULL)
+                       callto_supported = 1;
+       }
+       pclose(test);   
+       
+       if (!callto_supported) {
+               do_error_dialog(_("Your gnomemeeting version doesn't support 
--callto argument; You should update it."),("Cannot run gnomemeeting"));        
   
+               return;         
        }
+       
+       snprintf(buf,1024,"gnomemeeting -c callto://%s",ip);
+       /* should check version... 0.85, for example doesn't handle -c */
+       system(buf);
 }
 
 void ext_netmeeting_invite(msnconn * conn, char * from, char * friendlyname, 
invitation_voice * inv)