Changeset 2881

Show
Ignore:
Timestamp:
07/29/06 02:46:22
Author:
chipx86
Message:

Patch by Ed Catmur to fix type validation for the icon data on D-BUS v0.61. This closes tickets #75 and #67.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/notification-daemon/ChangeLog

    r2880 r2881  
     1Sat Jul 29 02:43:25 PDT 2006  Christian Hammond <chipx86@chipx86.com> 
     2 
     3    * src/daemon.c: 
     4      - Patch by Ed Catmur to fix type validation for the icon data on 
     5        D-BUS v0.61. This closes tickets #75 and #67. 
     6 
    17Wed Jul 26 23:44:24 PDT 2006  Christian Hammond <chipx86@chipx86.com> 
    28 

  • trunk/notification-daemon/NEWS

    r2880 r2881  
    11version 0.3.6: 
     2    * Fixed compatibility problems with D-BUS v0.61. (Bugs #67, #75) 
    23    * A notification's timeout will now pause while the mouse is hovering over 
    34      the notification. This allows users to respond to notifications without 

  • trunk/notification-daemon/src/daemon.c

    r2880 r2881  
    458458    GValue *value; 
    459459    GArray *tmp_array; 
    460  
    461     if (!G_VALUE_HOLDS(icon_data, G_TYPE_VALUE_ARRAY)) 
     460#if CHECK_DBUS_VERSION(0, 61) 
     461    GType struct_type; 
     462 
     463    struct_type = dbus_g_type_get_struct( 
     464        "GValueArray", 
     465        G_TYPE_INT, 
     466        G_TYPE_INT, 
     467        G_TYPE_INT, 
     468        G_TYPE_BOOLEAN, 
     469        G_TYPE_INT, 
     470        G_TYPE_INT, 
     471        dbus_g_type_get_collection("GArray", G_TYPE_UCHAR), 
     472        G_TYPE_INVALID); 
     473 
     474    if (!G_VALUE_HOLDS(icon_data, struct_type)) 
    462475    { 
    463476        g_warning("_notify_daemon_process_icon_data expected a " 
    …… 
    465478        return FALSE; 
    466479    } 
     480#endif /* D-BUS >= 0.61 */ 
    467481 
    468482    image_struct = (GValueArray *)g_value_get_boxed(icon_data);