View | Details | Raw Unified
Collapse All | Expand All

(-) hal-0.5.7.1/libhal/libhal.c.fixdbus (-20 / +18 lines)
 Lines 155-161    Link Here  

        
	libhal_ctx_shutdown(hal_ctx, &error);
	libhal_ctx_shutdown(hal_ctx, &error);

        
	libhal_ctx_free(hal_ctx);
	libhal_ctx_free(hal_ctx);

            

              
	dbus_connection_close(conn);

              
            

        
	dbus_connection_unref(conn);
	dbus_connection_unref(conn);

        
	dbus_error_free(&error);
	dbus_error_free(&error);

        

  

    

    

       Lines 701-707
       
    
  Link Here 
    

  

        
	libhal_ctx_shutdown (hal_ctx, &error);
	libhal_ctx_shutdown (hal_ctx, &error);

        
	libhal_ctx_free (hal_ctx);
	libhal_ctx_free (hal_ctx);

        

            

              
	dbus_connection_close (conn);

              
            

        
	dbus_connection_unref (conn);
	dbus_connection_unref (conn);

        

        
	if (show_device)
	if (show_device)

  

    

    

       Lines 1525-1531
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 1710-1716
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 1762-1768
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 1814-1820
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 1865-1871
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 1926-1932
       
    
  Link Here 
    

  

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

        

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		if (strcmp (error->name,
		if (strcmp (error->name,

        
			    "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {
			    "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {

        
			if (reason_why_locked != NULL) {
			if (reason_why_locked != NULL) {

  

    

    

       Lines 1985-1991
       
    
  Link Here 
    

  

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

        

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 2040-2046
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return NULL;
		return NULL;

        
	}
	}

  

    

    

       Lines 2125-2131
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 2179-2185
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 2365-2371
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 2652-2658
       
    
  Link Here 
    

  

        
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
	reply = dbus_connection_send_with_reply_and_block (ctx->connection,

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 2788-2794
       
    
  Link Here 
    

  

        
			    "type='signal',"
			    "type='signal',"

        
			    "interface='org.freedesktop.Hal.Device',"
			    "interface='org.freedesktop.Hal.Device',"

        
			    "sender='org.freedesktop.Hal'", error);
			    "sender='org.freedesktop.Hal'", error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		return FALSE;
		return FALSE;

        
	}
	}

        
	return TRUE;
	return TRUE;

  

    

    

       Lines 2820-2826
       
    
  Link Here 
    

  

        
		  "sender='org.freedesktop.Hal'," "path=%s", udi);
		  "sender='org.freedesktop.Hal'," "path=%s", udi);

        

        
	dbus_bus_add_match (ctx->connection, buf, error);
	dbus_bus_add_match (ctx->connection, buf, error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		return FALSE;
		return FALSE;

        
	}
	}

        
	return TRUE;
	return TRUE;

  

    

    

       Lines 2848-2854
       
    
  Link Here 
    

  

        
		  "sender='org.freedesktop.Hal'," "path=%s", udi);
		  "sender='org.freedesktop.Hal'," "path=%s", udi);

        

        
	dbus_bus_remove_match (ctx->connection, buf, error);
	dbus_bus_remove_match (ctx->connection, buf, error);

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		return FALSE;
		return FALSE;

        
	}
	}

        
	return TRUE;
	return TRUE;

  

    

    

       Lines 3223-3229
       
    
  Link Here 
    

  

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

        

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 3273-3279
       
    
  Link Here 
    

  

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

        

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}

  

    

    

       Lines 3342-3348
       
    
  Link Here 
    

  

        
							   message, -1,
							   message, -1,

        
							   error);
							   error);

        

            

              
	if (dbus_error_is_set (error)) {

              
	if (error != NULL && dbus_error_is_set (error)) {

            

        
		dbus_message_unref (message);
		dbus_message_unref (message);

        
		return FALSE;
		return FALSE;

        
	}
	}