Mercurial > pidgin
changeset 3382:e9a89676d120
[gaim-migrate @ 3401]
No longer do we build libicq.so -- run make in src/protocols/icq if you
feel you need it for some reason (you don't--use OSCAR)
TOC is no longer compiled statically by default. If you need it for some
reason, you can load the libtoc.so plugin.
Ari Pollak fixed up some #ifdefs to get IM images to work in gtk2, and he
fixed a few gtk font warnings elsewhere.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 07 Aug 2002 23:25:33 +0000 |
| parents | 5df81b058690 |
| children | bfed0b1ac718 |
| files | ChangeLog configure.ac configure.in src/conversation.c src/gtkimhtml.c src/multi.c src/protocols/Makefile.am src/protocols/icq/Makefile.am src/prpl.c |
| diffstat | 9 files changed, 46 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 07 22:37:58 2002 +0000 +++ b/ChangeLog Wed Aug 07 23:25:33 2002 +0000 @@ -27,8 +27,11 @@ - Plugins dialog (Ari Pollak) - GtkIMHtml, sorta (Ari Pollak, Christian Hammond) - Buddy Icons + - IM Images * Notify.c plugin rewritten; check its configure dialog (Thanks, Etan Reisner) + * TOC no longer compiles statically by default--use OSCAR + * ICQ plugin no longer gets built--use OSCAR version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan)
--- a/configure.ac Wed Aug 07 22:37:58 2002 +0000 +++ b/configure.ac Wed Aug 07 23:25:33 2002 +0000 @@ -68,7 +68,7 @@ AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes) AC_ARG_WITH(static-prpls, [ --with-static-prpls link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="oscar toc") if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="gg icq irc jabber msn napster oscar toc yahoo zephyr" + STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr" fi AC_SUBST(STATIC_PRPLS) STATIC_LINK_LIBS= @@ -80,7 +80,6 @@ load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));" case $i in gg) static_gg=yes ;; - icq) static_icq=yes ;; irc) static_irc=yes ;; jabber) static_jabber=yes ;; msn) static_msn=yes ;; @@ -93,7 +92,6 @@ esac done AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") -AM_CONDITIONAL(STATIC_ICQ, test "x$static_icq" = "xyes") AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
--- a/configure.in Wed Aug 07 22:37:58 2002 +0000 +++ b/configure.in Wed Aug 07 23:25:33 2002 +0000 @@ -67,7 +67,7 @@ AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes) AC_ARG_WITH(static-prpls, [ --with-static-prpls link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="oscar toc") if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="gg icq irc jabber msn napster oscar toc yahoo zephyr" + STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr" fi AC_SUBST(STATIC_PRPLS) STATIC_LINK_LIBS= @@ -79,7 +79,6 @@ load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));" case $i in gg) static_gg=yes ;; - icq) static_icq=yes ;; irc) static_irc=yes ;; jabber) static_jabber=yes ;; msn) static_msn=yes ;; @@ -92,7 +91,6 @@ esac done AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") -AM_CONDITIONAL(STATIC_ICQ, test "x$static_icq" = "xyes") AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
--- a/src/conversation.c Wed Aug 07 22:37:58 2002 +0000 +++ b/src/conversation.c Wed Aug 07 23:25:33 2002 +0000 @@ -2628,7 +2628,9 @@ style = gtk_style_new(); if (!GTK_WIDGET_REALIZED(label)) gtk_widget_realize(label); +#if !GTK_CHECK_VERSION(1,3,0) gdk_font_unref(gtk_style_get_font(style)); +#endif gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style))); style->fg[0].red = 0x0000; style->fg[0].green = 0x9999; @@ -2688,7 +2690,9 @@ style = gtk_style_new(); if (!GTK_WIDGET_REALIZED(label)) gtk_widget_realize(label); +#if !GTK_CHECK_VERSION(1,3,0) gdk_font_unref(gtk_style_get_font(style)); +#endif gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style))); c->unseen = 0; gtk_widget_set_style(label, style);
--- a/src/gtkimhtml.c Wed Aug 07 22:37:58 2002 +0000 +++ b/src/gtkimhtml.c Wed Aug 07 23:25:33 2002 +0000 @@ -36,7 +36,7 @@ #include <locale.h> #endif -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> #else @@ -274,7 +274,7 @@ gint width,height; GtkIMHtml *imhtml; GtkIMHtmlBit *bit; -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) GdkPixbuf *pb; #endif }; @@ -2673,7 +2673,7 @@ g_free (copy); } else if ((bit->type == TYPE_SMILEY) || (bit->type == TYPE_IMG)) { -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) if (bit->img) { GdkPixbuf *imagepb = bit->img->pb; GdkPixbuf *tmp = NULL; @@ -3405,9 +3405,12 @@ char *tmp, *imagedata, *e; const gchar *alltext; struct im_image *img; -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) GdkPixbufLoader *load; GdkPixbuf *imagepb = NULL; +#if GTK_CHECK_VERSION(1,3,0) + GError *err; +#endif #endif NEW_BIT (NEW_TEXT_BIT); if (!id || !datasize) @@ -3447,16 +3450,22 @@ if (img->len) { img->data = g_malloc(img->len); memcpy(img->data, imagedata, img->len); -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) load = gdk_pixbuf_loader_new(); + +#if GTK_CHECK_VERSION(1,3,0) + if (!gdk_pixbuf_loader_write(load, imagedata, + img->len, &err)) +#else if (!gdk_pixbuf_loader_write(load, imagedata, img->len)) +#endif g_print("IM Image corrupt or unreadable.\n"); else imagepb = gdk_pixbuf_loader_get_pixbuf(load); img->pb = imagepb; #endif } -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) if (imagepb) { bit = g_new0 (GtkIMHtmlBit, 1); bit->type = TYPE_IMG; @@ -3677,7 +3686,7 @@ gdk_pixmap_unref (bit->pm); if (bit->bm) gdk_bitmap_unref (bit->bm); -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) if (bit->img) { g_free(bit->img->filename); g_free(bit->img->data); @@ -3701,7 +3710,7 @@ imhtml->click = g_list_remove (imhtml->click, imhtml->click->data); } -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) while (imhtml->im_images) { imhtml->im_images = g_list_remove(imhtml->im_images, imhtml->im_images->data); } @@ -3733,7 +3742,7 @@ imhtml->scroll_timer = 0; } -#if USE_PIXBUF +#if USE_PIXBUF || GTK_CHECK_VERSION(1,3,0) g_list_free(imhtml->im_images); imhtml->im_images = NULL; #endif
--- a/src/multi.c Wed Aug 07 22:37:58 2002 +0000 +++ b/src/multi.c Wed Aug 07 23:25:33 2002 +0000 @@ -944,9 +944,16 @@ u->gc->wants_to_die = TRUE; signoff(u->gc); } else { - do_error_dialog(_("You cannot log this account in; you do not have " - "the protocol it uses loaded, or the protocol does " - "not have a login function."), _("Login Error")); + if (u->protocol == PROTO_TOC) + do_error_dialog(_("You have attempted to login an IM account using the " + "TOC protocol. Because this protocol is inferior to " + "OSCAR, it is now compiled as a plugin by default. " + "To login, edit this account to use OSCAR or load the " + "TOC plugin."), _("Login Error")); + else + do_error_dialog(_("You cannot log this account in; you do not have " + "the protocol it uses loaded, or the protocol does " + "not have a login function."), _("Login Error")); } l = l->next; }
--- a/src/protocols/Makefile.am Wed Aug 07 22:37:58 2002 +0000 +++ b/src/protocols/Makefile.am Wed Aug 07 23:25:33 2002 +0000 @@ -1,4 +1,4 @@ -DIST_SUBDIRS = gg irc jabber msn napster oscar toc yahoo zephyr icq +DIST_SUBDIRS = gg irc jabber msn napster oscar toc yahoo zephyr if PRPLS
--- a/src/protocols/icq/Makefile.am Wed Aug 07 22:37:58 2002 +0000 +++ b/src/protocols/icq/Makefile.am Wed Aug 07 23:25:33 2002 +0000 @@ -10,58 +10,6 @@ CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS) libicq_la_LDFLAGS = -module -avoid-version -if STATIC_ICQ - -st = -DSTATIC -pkg_LTLIBRARIES = -noinst_LIBRARIES = libicq.a - -libicq_a_SOURCES = chatsession.c \ - chatsession.h \ - contacts.c \ - contacts.h \ - cyrillic.c \ - eventhandle.c \ - eventhandle.h \ - filesession.c \ - filesession.h \ - icq.h \ - icqbyteorder.c \ - icqbyteorder.h \ - icqevent.c \ - icqevent.h \ - icqlib.c \ - icqlib.h \ - icqpacket.c \ - icqpacket.h \ - icqtypes.h \ - list.c \ - list.h \ - proxy.c \ - queue.c \ - queue.h \ - socketmanager.c \ - socketmanager.h \ - stdpackets.c \ - stdpackets.h \ - tcp.c \ - tcp.h \ - tcpchathandle.c \ - tcpfilehandle.c \ - tcphandle.c \ - tcplink.c \ - tcplink.h \ - timeout.c \ - timeout.h \ - udp.c \ - udp.h \ - udphandle.c \ - util.c \ - util.h \ - gaim_icq.c - -else - st = pkg_LTLIBRARIES = libicq.la noinst_LIBRARIES = @@ -109,5 +57,3 @@ util.c \ util.h \ gaim_icq.c - -endif
--- a/src/prpl.c Wed Aug 07 22:37:58 2002 +0000 +++ b/src/prpl.c Wed Aug 07 23:25:33 2002 +0000 @@ -74,6 +74,14 @@ " successfully loaded."), _("Protocol Error")); return; } + + if (p->protocol == PROTO_ICQ) + do_error_dialog(_("Gaim has loaded the ICQ plugin. This plugin has been deprecated. " + "As such, it was probably not compiled from the same version of the " + "source as this application was, and cannot be guaranteed to work. " + "It is reccomended that you use the AIM/ICQ protocol to connect to ICQ"), + _("Protocol Warning")); + p = g_new0(struct prpl, 1); pi(p); if ((old = find_prpl(p->protocol)) != NULL)