grim/guifications2

merge of '791c134efca0667e4c987db12a3a85a78f26cb57'
org.guifications.gf2
2009-04-05, Gary Kramlich
42aa4009a621
Parents 06a23c9632d5f02c9fc1f3b3
Children 71b2b4201b86
merge of '791c134efca0667e4c987db12a3a85a78f26cb57'
and '7cd0ee0e49a6622bcb1ebfd171d0ca1815f36793'
2 files changed, 10 insertions(+), 16 deletions(-)
  • +0 -1
    ChangeLog
  • +10 -15
    src/gf_notification.c
    • --- a/ChangeLog Sun Apr 05 02:34:45 2009 -0400
    +++ b/ChangeLog Sun Apr 05 05:17:35 2009 -0400
    @@ -4,7 +4,6 @@
    grimmy.
    * Memory leak fixes
    * Added a new notification "new-emails" for handling multiple new emails.
    - * Gave priority to use_gtk over a background image in themes.
    Version 2.16 12/16/07:
    * Really fixed the G_GNUC_NULL_TERMINATED errors on non-Windows platforms.
    --- a/src/gf_notification.c Sun Apr 05 02:34:45 2009 -0400
    +++ b/src/gf_notification.c Sun Apr 05 05:17:35 2009 -0400
    @@ -95,22 +95,17 @@
    if(data)
    notification->use_gtk = atoi(data);
    - /* if we're supposed to use the gtktheme, look for the width and height
    - * attributes. If not, look for the background attribute.
    - */
    - if(notification->use_gtk) {
    - data = xmlnode_get_attrib(node, "width");
    - if(data)
    - notification->width = atoi(data);
    + data = xmlnode_get_attrib(node, "background");
    + if(data)
    + notification->background = g_strdup(data);
    - data = xmlnode_get_attrib(node, "height");
    - if(data)
    - notification->height = atoi(data);
    - } else {
    - data = xmlnode_get_attrib(node, "background");
    - if(data)
    - notification->background = g_strdup(data);
    - }
    + data = xmlnode_get_attrib(node, "width");
    + if(data)
    + notification->width = atoi(data);
    +
    + data = xmlnode_get_attrib(node, "height");
    + if(data)
    + notification->height = atoi(data);
    data = xmlnode_get_attrib(node, "alias");
    if(data)