Add convenience connectAndInit() functions.

10 files changed, 31 insertions, 52 deletions

diff --git a/lib/comm.c b/lib/comm.c
index 07b6254..e5cbd72 100644
--- a/lib/comm.c
+++ b/lib/comm.c
@@ -362,4 +362,22 @@ void dapi_windowInfoInitWindow( DapiWindowInfo* winfo, long window )
     winfo->window = window;
     }
 
+DapiConnection* dapi_connectAndInit()
+    {
+    return dapi_namedConnectAndInit( "" );
+    }
+
+DapiConnection* dapi_namedConnectAndInit( const char* name )
+    {
+    DapiConnection* conn = dapi_namedConnect( name );
+    if( conn == NULL )
+        return NULL;
+    if( !dapi_Init( conn ))
+        {
+        dapi_close( conn );
+        return NULL;
+        }
+    return conn;
+    }
+
 #include "../kde/gen/comm_generated.c"
diff --git a/lib/comm.h b/lib/comm.h
index 5737113..499bbb8 100644
--- a/lib/comm.h
+++ b/lib/comm.h
@@ -12,6 +12,9 @@ DapiConnection* dapi_namedConnect( const char* name );
 void dapi_close( DapiConnection* conn );
 int dapi_socket( DapiConnection* conn );
 
+DapiConnection* dapi_connectAndInit( void );
+DapiConnection* dapi_namedConnectAndInit( const char* name );
+
 int dapi_bindSocket( void );
 int dapi_namedBindSocket( const char* name );
 DapiConnection* dapi_acceptSocket( int sock );
diff --git a/tests/test_callbacks.c b/tests/test_callbacks.c
index 4847b36..a62cba8 100644
--- a/tests/test_callbacks.c
+++ b/tests/test_callbacks.c
@@ -13,17 +13,12 @@ static void callback( DapiConnection* conn, int seq, int ord )
 int main()
     {
     int seq;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     seq = dapi_callbackButtonOrder( conn, callback );
     printf( "Order call1: %d\n", seq );
     seq = dapi_callbackButtonOrder( conn, callback );
diff --git a/tests/test_calls.c b/tests/test_calls.c
index e4afd92..38e0d89 100644
--- a/tests/test_calls.c
+++ b/tests/test_calls.c
@@ -6,17 +6,12 @@
 int main()
     {
     int ord;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     ord = dapi_ButtonOrder( conn );
     printf( "Order: %d (%s)\n", ord, ord == 0 ? "Failed" : ord == 1 ? "Ok/Cancel" : "Cancel/Ok" );
     dapi_close( conn );
diff --git a/tests/test_capabilities.c b/tests/test_capabilities.c
index ded1a5a..5b7b482 100644
--- a/tests/test_capabilities.c
+++ b/tests/test_capabilities.c
@@ -8,17 +8,12 @@ int main()
     {
     intarr capabilities;
     int i;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     if( dapi_Capabilities( conn, &capabilities ))
         {
         int has_mailto = 0;
diff --git a/tests/test_fallback.c b/tests/test_fallback.c
index 6df684f..6f62186 100644
--- a/tests/test_fallback.c
+++ b/tests/test_fallback.c
@@ -5,14 +5,7 @@
 
 static void test( DapiConnection* conn, const char* txt )
     {
-    int ord;
-    if( !dapi_Init( conn ))
-        {
-        printf( "Initialization(%s) failed!\n", txt );
-        dapi_close( conn );
-        return;
-        }
-    ord = dapi_ButtonOrder( conn );
+    int ord = dapi_ButtonOrder( conn );
     printf( "Order(%s): %d (%s)\n", txt, ord, ord == 0 ? "Failed" : ord == 1 ? "Ok/Cancel" : "Cancel/Ok" );
     dapi_close( conn );
     }
@@ -20,7 +13,7 @@ static void test( DapiConnection* conn, const char* txt )
 /* run daemon with --dapiname fallback to test fallbacks */
 int main()
     {
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn != NULL )
         {
         printf( "Connected to generic.\n" );
@@ -30,7 +23,7 @@ int main()
         {
         printf( "Connection to generic failed.\n" );
         }
-    conn = dapi_namedConnect( "fallback" );
+    conn = dapi_namedConnectAndInit( "fallback" );
     if( conn != NULL )
         {
         printf( "Connected to fallback.\n" );
diff --git a/tests/test_mailto.c b/tests/test_mailto.c
index 70cc4c4..4a8c209 100644
--- a/tests/test_mailto.c
+++ b/tests/test_mailto.c
@@ -9,17 +9,12 @@ int main()
     int ok;
     stringarr attachments;
     char* attachments_data[] = { "/tmp/mailtotest.txt" };
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     system( "touch /tmp/mailtotest.txt" );
     attachments.count = 1;
     attachments.data = attachments_data;
diff --git a/tests/test_remotefile.c b/tests/test_remotefile.c
index 123a84c..2b3f8fe 100644
--- a/tests/test_remotefile.c
+++ b/tests/test_remotefile.c
@@ -9,17 +9,12 @@ int main()
     {
     char* local;
     int ok;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     local = dapi_LocalFile_Window( conn, "http://kde.org", "",  0, 0 ); /* no download, should fail */
     printf( "Local file1: %s - %s\n", local ? local : "?", local ? "Failed" : "Ok" );
     if( local )
diff --git a/tests/test_runasuser.c b/tests/test_runasuser.c
index e99b340..5a238c4 100644
--- a/tests/test_runasuser.c
+++ b/tests/test_runasuser.c
@@ -6,17 +6,12 @@
 int main()
     {
     int ok;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     ok = dapi_RunAsUser_Window( conn, "", "xterm -title test", 0 ); /* no mainwindow */
     printf( "Result: %s\n", ok == 1 ? "Ok" : "Failed" );
     dapi_close( conn );
diff --git a/tests/test_screensaving.c b/tests/test_screensaving.c
index 86fbb4c..d20a13f 100644
--- a/tests/test_screensaving.c
+++ b/tests/test_screensaving.c
@@ -7,17 +7,12 @@
 int main()
     {
     int ok;
-    DapiConnection* conn = dapi_connect();
+    DapiConnection* conn = dapi_connectAndInit();
     if( conn == NULL )
         {
         fprintf( stderr, "Cannot connect!\n" );
         return 1;
         }
-    if( !dapi_Init( conn ))
-        {
-        fprintf( stderr, "Initialization failed!\n" );
-        return 2;
-        }
     ok = dapi_SuspendScreensaving( conn, 1 );
     printf( "Result1: %s\n", ok == 1 ? "Ok" : "Failed" );
     sleep( 10 );