grim/guifications2

well we compile somewhat successfully, but we don't load against 3.0.0-devel

2011-12-04, Gary Kramlich
3a8f4f41e93b
Parents 9435c774f922
Children d8821425cf2b
well we compile somewhat successfully, but we don't load against 3.0.0-devel
8 files changed, 33 insertions(+), 13 deletions(-)
  • +1 -1
    .hgignore
  • +3 -0
    src/Makefile.am
  • +11 -0
    src/gf_display.c
  • +2 -0
    src/gf_display.h
  • +10 -7
    src/gf_item_text.c
  • +1 -1
    src/gf_preferences.c
  • +1 -1
    src/gf_theme_editor.c
  • +4 -3
    src/x11/gf_x11_display.c
    • --- a/.hgignore Sun Dec 04 00:41:53 2011 -0600
    +++ b/.hgignore Sun Dec 04 01:00:39 2011 -0600
    @@ -26,7 +26,6 @@
    po/Makefile.in.in
    po/POTFILES
    po/stamp-it
    -src/.libs
    stamp-h1
    syntax: regexp
    @@ -34,3 +33,4 @@
    config.(guess|log|status|sub)
    ^pre_config\.h\.in~?$
    \.deps\/
    +\.libs\/
    --- a/src/Makefile.am Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/Makefile.am Sun Dec 04 01:00:39 2011 -0600
    @@ -1,3 +1,4 @@
    +SUBDIRS =
    DIST_SUBDIRS = win32 x11
    EXTRA_DIST = \
    @@ -66,10 +67,12 @@
    if USE_X11
    guifications_la_LIBADD += x11/libguifications-x11.la
    +SUBDIRS += x11
    endif
    if USE_WIN32
    guifications_la_LIBADD += win32/libguifications-win32.la
    +SUBDIRS += win32
    endif
    AM_CPPFLAGS = \
    --- a/src/gf_display.c Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/gf_display.c Sun Dec 04 01:00:39 2011 -0600
    @@ -1056,3 +1056,14 @@
    purple_prefs_disconnect_callback(mon_chg_id);
    #endif /* GTK_CHECK_VERSION(2,2,0) */
    }
    +
    +gint
    +gf_display_get_monitor(void) {
    + return disp_monitor;
    +}
    +
    +gint
    +gf_display_get_screen(void) {
    + return disp_screen;
    +}
    +
    --- a/src/gf_display.h Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/gf_display.h Sun Dec 04 01:00:39 2011 -0600
    @@ -74,6 +74,8 @@
    /* private stuff, implemented in the x11/win32 static libraries */
    gboolean gf_display_get_workarea(GdkRectangle *rect);
    gboolean gf_display_screen_saver_is_running(void);
    +gint gf_display_get_screen(void);
    +gint gf_display_get_monitor(void);
    G_END_DECLS
    --- a/src/gf_item_text.c Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/gf_item_text.c Sun Dec 04 01:00:39 2011 -0600
    @@ -482,25 +482,28 @@
    break;
    case 'c': /* conversation name */
    if (conv) {
    - if(conv->type == PURPLE_CONV_TYPE_IM) {
    + PurpleConversationType type = purple_conversation_get_type(conv);
    + const gchar *name = purple_conversation_get_name(conv);
    +
    + if(type == PURPLE_CONV_TYPE_IM) {
    PurpleBuddy *buddy;
    - buddy = purple_find_buddy(account, conv->name);
    + buddy = purple_find_buddy(account, name);
    if(buddy)
    str = g_string_append(str, purple_buddy_get_contact_alias(buddy));
    else
    - str = g_string_append(str, conv->name);
    - } else if(conv->type == PURPLE_CONV_TYPE_CHAT) {
    + str = g_string_append(str, name);
    + } else if(type == PURPLE_CONV_TYPE_CHAT) {
    PurpleChat *chat;
    - chat = purple_blist_find_chat(account, conv->name);
    + chat = purple_blist_find_chat(account, name);
    if(chat) {
    str = g_string_append(str, purple_chat_get_name(chat));
    } else {
    - str = g_string_append(str, conv->name);
    + str = g_string_append(str, name);
    }
    } else {
    - str = g_string_append(str, conv->name);
    + str = g_string_append(str, name);
    }
    } else {
    str = g_string_append(str, target);
    --- a/src/gf_preferences.c Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/gf_preferences.c Sun Dec 04 01:00:39 2011 -0600
    @@ -664,7 +664,7 @@
    * other platforms, if need be */
    /* Q: shouldn't tgz be tail? */
    /* A: no. */
    - purple_util_fetch_url(name, TRUE, NULL, FALSE, theme_got_url, ".tgz");
    + purple_util_fetch_url(name, TRUE, NULL, FALSE, -1, theme_got_url, ".tgz");
    }
    gtk_drag_finish(dc, TRUE, FALSE, t);
    --- a/src/gf_theme_editor.c Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/gf_theme_editor.c Sun Dec 04 01:00:39 2011 -0600
    @@ -1,6 +1,6 @@
    /*
    * Guifications - The end all, be all, toaster popup plugin
    - * Copyright (C) 2003-2008 Gary Kramlich
    + * Copyright (C) 2003-2011 Gary Kramlich
    *
    * This program is free software; you can redistribute it and/or
    * modify it under the terms of the GNU General Public License
    --- a/src/x11/gf_x11_display.c Sun Dec 04 00:41:53 2011 -0600
    +++ b/src/x11/gf_x11_display.c Sun Dec 04 01:00:39 2011 -0600
    @@ -16,8 +16,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
    */
    +#include <glib.h>
    #include <gdk/gdkx.h>
    -#include <x11/Xlib.h>
    +#include <X11/Xlib.h>
    #include <X11/Xutil.h>
    #include <X11/Xatom.h>
    @@ -45,7 +46,7 @@
    return FALSE;
    /* get the screen according to the prefs */
    - g_screen = gdk_display_get_screen(g_display, disp_screen);
    + g_screen = gdk_display_get_screen(g_display, gf_display_get_screen());
    if(!g_screen)
    return FALSE;
    @@ -59,7 +60,7 @@
    /* find the _NET_NUMBER_OF_DESKTOPS atom */
    xa_desktops = XInternAtom(x_display, "_NET_NUMBER_OF_DESKTOPS", True);
    - if(xa_desktop == None)
    + if(xa_desktops == None)
    return FALSE;
    /* get the number of desktops */