grim/guifications1

ok compiles again..

2004-01-14, grim
3549d43914d3
Parents e758cf4ec153
Children 104f6faa875a
ok compiles again..
2 files changed, 32 insertions(+), 31 deletions(-)
  • +2 -1
    configure.ac
  • +30 -30
    src/gf_pixbuf.c
    • --- a/configure.ac Wed Jan 14 00:28:38 2004 +0000
    +++ b/configure.ac Wed Jan 14 05:53:47 2004 +0000
    @@ -9,6 +9,7 @@
    GF_VERSION="`cat ./VERSION`"
    AM_INIT_AUTOMAKE([guifications], $GF_VERSION, 'no-define')
    AC_DEFINE_UNQUOTED(GF_VERSION, "$GF_VERSION", [Guifications Version])
    +AC_DEFINE_UNQUOTED(GF_CONFIG_ARGS, "$ac_configure_args", [configure arguments])
    #
    # Our header
    @@ -53,7 +54,7 @@
    if test -z "$result"; then
    AC_MSG_RESULT([not found!])
    - AC_MSG_ERROR([*** Can not continue])
    + AC_MSG_ERROR([*** Can not continue, note this must be an absolute path])
    fi
    }
    --- a/src/gf_pixbuf.c Wed Jan 14 00:28:38 2004 +0000
    +++ b/src/gf_pixbuf.c Wed Jan 14 05:53:47 2004 +0000
    @@ -29,47 +29,47 @@
    #include "gf_pixbuf.h"
    #include "gf_types.h"
    -static gchar *
    -gf_format_text(GaimBuddy *buddy, gf_event event, gf_theme *theme) {
    +static const gchar *
    +gf_format_text(GaimBuddy *buddy, gint line, gf_event event, gf_theme *theme) {
    /* Formatting Options
    %N = Screen Name %A = Alias
    %P = Protocol %M = Away Message
    %C = Account %W = Warning level
    */
    - char formatted[255], format[255];
    + char formatted[255], *format;
    gchar *buff = NULL;
    int c = 0, i = 0;
    - strcpy(format, theme->notification[event]->text[line]->format);
    + format = theme->notification[event].text[line].format;
    while (*format) {
    if (*format == '%') {
    switch(*(format+1)) {
    case 'N': /* screen name */
    for (i = 0; i < strlen(buddy->name); i++)
    - output[c+i] = buddy->name[i];
    + formatted[c+i] = buddy->name[i];
    c += i;
    break;
    case 'A': /* alias, follows alias pref rules */
    buff = g_strdup(gaim_get_buddy_alias(buddy));
    for (i = 0; i < strlen(buff); i++)
    - output[c+i] = buff[i];
    + formatted[c+i] = buff[i];
    c+=i;
    g_free(buff);
    break;
    case 'P': /* protocol */
    buff = g_strdup(gaim_account_get_protocol_id(buddy->account));
    for (i = 0; i < strlen(buff); i++)
    - output[c+i] = buff[i];
    + formatted[c+i] = buff[i];
    c+=i;
    g_free(buff);
    break;
    case 'M': /* away message if event isn't away this value
    gets removed */
    if (event == gf_event_away) {
    - buff = g_strdup(serv_get_away(buddy->account->gc, buddy->name));
    + /*buff = g_strdup(serv_get_away(buddy->account->gc, buddy->name)); */
    for (i = 0; i < strlen(buff); i++)
    - output[c+i] = buff[i];
    + formatted[c+i] = buff[i];
    c+=i;
    g_free(buff);
    }
    @@ -77,7 +77,7 @@
    case 'C': /* account name */
    buff = g_strdup(buddy->account->username);
    for (i = 0; i < strlen(buff); i++)
    - output[c+i] = buff[i];
    + formatted[c+i] = buff[i];
    c+=i;
    g_free(buff);
    break;
    @@ -85,18 +85,18 @@
    value gets removed */
    break;
    case '%':
    - output[i] = '%';
    + formatted[i] = '%';
    c++;
    break;
    }
    } else {
    - output[i] = *format;
    - c++:
    + formatted[i] = *format;
    + c++;
    }
    format++;
    }
    - return output;
    + return formatted;
    }
    static void
    @@ -125,7 +125,7 @@
    static gint
    gf_icon_get_size(gint icon, gf_event event, gf_theme *theme) {
    - switch (theme->notification[event]->icon[icon].size) {
    + switch (theme->notification[event].icon[icon].size) {
    case icon_size_tiny: return 16; break;
    case icon_size_small: return 24; break;
    case icon_size_normal: return 48; break;
    @@ -158,8 +158,8 @@
    icon_size = gf_icon_get_size(icon, event, theme);
    icon_half_size = icon_size / 2;
    - icon_offset_x = theme->notification[event]->icon[icon].item.offset_horizontal;
    - icon_offset_y = theme->notification[event]->icon[icon].item.offset_vertical;
    + icon_offset_x = theme->notification[event].icon[icon].item.offset_horizontal;
    + icon_offset_y = theme->notification[event].icon[icon].item.offset_vertical;
    icon_half_offset_x = icon_offset_x / 2;
    icon_half_offset_y = icon_offset_y / 2;
    @@ -171,7 +171,7 @@
    lon = bg_half_width - (icon_half_size + icon_half_offset_x); /* x */
    lat = bg_half_height - (icon_half_size + icon_half_offset_y); /* y */
    - switch (theme->notification[event]->icon[icon]->position) {
    + switch (theme->notification[event].icon[icon].position) {
    case item_position_nw: *x = west; *y = north; break;
    case item_position_n: *x = lon; *y = north; break;
    case item_position_ne: *x = east; *y = north; break;
    @@ -185,7 +185,7 @@
    }
    static void
    -gf_get_text_position(gint *x, gint *y, gint line, PangoLayout *layout, gf_event event, gf_theme theme) {
    +gf_get_text_position(gint *x, gint *y, gint line, PangoLayout *layout, gf_event event, gf_theme *theme) {
    gint bg_width, bg_height;
    gint bg_half_width, bg_half_height;
    gint text_width, text_height;
    @@ -201,14 +201,14 @@
    pango_layout_get_pixel_size(layout, &text_width, &text_height);
    - if (theme->notification[event]->line[line]->width != 0)
    - text_width = theme->notification[event]->line[line]->width;
    + if (theme->notification[event].text[line].width != 0)
    + text_width = theme->notification[event].text[line].width;
    text_half_width = text_width / 2;
    text_half_height = text_height / 2;
    - text_offset_x = theme->notification[event]->line[line]->item.offset_horizontal;
    - text_offset_y = theme->notification[event]->line[line]->item.offset_vertical;
    + text_offset_x = theme->notification[event].text[line].item.offset_horizontal;
    + text_offset_y = theme->notification[event].text[line].item.offset_vertical;
    text_half_offset_x = text_offset_x / 2;
    text_half_offset_y = text_offset_y / 2;
    @@ -220,7 +220,7 @@
    lon = bg_half_width - (text_half_width + text_half_offset_x); /* x */
    lat = bg_half_height - (text_half_height + text_half_offset_y); /* y */
    - switch (theme->notification[event]->line.position) {
    + switch (theme->notification[event].text[line].position) {
    case item_position_nw: *x = west; *y = north; break;
    case item_position_n: *x = lon; *y = north; break;
    case item_position_ne: *x = east; *y = north; break;
    @@ -269,12 +269,12 @@
    gf_pixbuf = gdk_pixbuf_copy(background);
    g_object_unref(background);
    - if (theme->notification[event]->icons > 0)
    - for (i = 0; i < theme->notification[event]->icons; i++) {
    - if (!theme->notification[event]->icon[i].item.visible)
    + if (theme->notification[event].icons > 0)
    + for (i = 0; i < theme->notification[event].icons; i++) {
    + if (!theme->notification[event].icon[i].item.visible)
    continue;
    - switch (theme->notification[event]->icon[i]) {
    + switch (theme->notification[event].icon[i].type) {
    case icon_protocol:
    icon = create_prpl_icon(buddy->account);
    break;
    @@ -307,8 +307,8 @@
    g_object_unref(icon_scaled);
    }
    - if (theme->notification[event]->lines > 0)
    - for (i = 0; i < theme->notification[event]->lines; i++) {
    + if (theme->notification[event].lines > 0)
    + for (i = 0; i < theme->notification[event].lines; i++) {
    }
    return gf_pixbuf;