Mercurial > pidgin.yaz
view src/gtkimhtml.h @ 7652:ac6b2b3a9a1f
[gaim-migrate @ 8296]
Bj?rn Voigt (bjoernv) writes:
" I found a small problem in Gaim's proxy settings. There
is an option "Use Environmental Settings". This option
does not work as expected.
Gaim reads the environment variables http_proxy (or
HTTP_PROXY or HTTPPROXY) and http_proxy_port (or
HTTP_PROXY_PORT or HTTPPROXYPORT) and variables for
proxy user and proxy password. Gaim expects the
following format:
export http_proxy=your.proxy.server
export http_proxy_port=8080
As far as I know this is a unusual format. Probably
there is no
standard document, which describes the correct format
of proxy
variables, but browsers like Konqueror, Amaya, Lynx and
others use a pseudo standard format:
export http_proxy="http://your.proxy.server:8080/"
The port number defaults to 80. The variable
http_proxy_port is
unknown. The proxy variable format is described in some
W3C pages, for instance:
http://www.w3.org/Daemon/User/Proxies/ProxyClients.html
http://www.w3.org/Library/User/Using/Proxy.html
http://www.w3.org/Amaya/User/Proxy.html
Solution
--------
My patch fixes the proxy environment variable parsing
in src/proxy.c:1626: gaim_proxy_connect(). The patch
removes
http_proxy_port and uses gaim_url_parse() from
src/util.c to parse the http_proxy variable.
Remaining problems
------------------
If a user has adjusted his proxy settings to Gaim's old
proxy variable format, he gets an error. I don't think,
that this is a big problem, as not much users set their
proxy variables only for one program (old proxy
variables where incompatible with browsers like Lynx,
Konqueror,
...).
Gaim still doesn't look at the no_proxy variable. This
variables
defines hosts and domains, which should be connected
directly:
export
no_proxy="cern.ch,ncsa.uiuc.edu,some.host:8080"
For example, one user may want to connect to Yahoo!
over a proxy and to an internal Jabber server without a
proxy. But the user can define individual proxy
variables for each account."
he continues:
"Nathan Walp <faceprint@faceprint.com> wrote:
> Why not have your patch check to see if the http_proxy var
starts with
> "http://", and if so, parse it, otherwise fall
back on the
old behavior.
Ok, the function gaim_url_parse() automatically detects
hostnames and port numbers, if the http_proxy URL does not
start with http://.
My new patch also checks for http_proxy_port. Now my patch
(file proxy2.patch) is fully backward compatible and tested."
given how rarely the current proxy code works, i don't see how this could
possibly make things worse, so i'm taking a chance since it compiles.
someone please test this.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sat, 29 Nov 2003 03:46:24 +0000 |
parents | 15155dbc768a |
children | 6a9acef3b867 |
line wrap: on
line source
/** * @file gtkimhtml.h GTK+ IM/HTML rendering component * @ingroup gtkui * * Copyright (C) 2000, Eric Warmenhoven <warmenhoven@yahoo.com> * * This program is free software; you can redistribute it and/or modify * under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __GTK_IMHTML_H #define __GTK_IMHTML_H #include <gdk/gdk.h> #include <gtk/gtktextview.h> #include <gtk/gtktooltips.h> #include <gtk/gtkimage.h> #ifdef __cplusplus extern "C" { #endif #define GTK_TYPE_IMHTML (gtk_imhtml_get_type ()) #define GTK_IMHTML(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTML, GtkIMHtml)) #define GTK_IMHTML_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTML, GtkIMHtmlClass)) #define GTK_IS_IMHTML(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMHTML)) #define GTK_IS_IMHTML_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMHTML)) #define GTK_IMHTML_SCALABLE(obj) ((GtkIMHtmlScalable *)obj) #define GTK_IMHTML_COPYABLE(obj) ((GtkIMHtmlCopyable *)obj) typedef struct _GtkIMHtml GtkIMHtml; typedef struct _GtkIMHtmlClass GtkIMHtmlClass; typedef struct _GtkIMHtmlFontDetail GtkIMHtmlFontDetail; /* The five elements contained in a FONT tag */ typedef struct _GtkSmileyTree GtkSmileyTree; typedef struct _GtkIMHtmlSmiley GtkIMHtmlSmiley; typedef struct _GtkIMHtmlScalable GtkIMHtmlScalable; typedef struct _GtkIMHtmlImage GtkIMHtmlImage; typedef struct _GtkIMHtmlHr GtkIMHtmlHr; typedef struct _GtkIMHtmlCopyable GtkIMHtmlCopyable; struct _GtkIMHtml { GtkTextView text_view; GtkTextBuffer *text_buffer; GtkTextMark *end; gboolean comments, smileys; GdkCursor *hand_cursor; GdkCursor *arrow_cursor; GHashTable *smiley_data; GtkSmileyTree *default_smilies; gboolean show_smileys; gboolean show_comments; GtkWidget *tip_window; char *tip; guint tip_timer; GList *scalables; GdkRectangle old_rect; GSList *copyables; gchar *search_string; }; struct _GtkIMHtmlClass { GtkTextViewClass parent_class; void (*url_clicked)(GtkIMHtml *, const gchar *); }; struct _GtkIMHtmlFontDetail { gushort size; gchar *face; gchar *fore; gchar *back; gchar *sml; }; struct _GtkSmileyTree { GString *values; GtkSmileyTree **children; GtkIMHtmlSmiley *image; }; struct _GtkIMHtmlSmiley { gchar *smile; gchar *file; GdkPixbufAnimation *icon; gboolean hidden; }; struct _GtkIMHtmlScalable { void (*scale)(struct _GtkIMHtmlScalable *, int, int); void (*add_to)(struct _GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *); void (*free)(struct _GtkIMHtmlScalable *); }; struct _GtkIMHtmlCopyable { GtkTextMark *mark; char *text; }; struct _GtkIMHtmlImage { GtkIMHtmlScalable scalable; GtkImage *image; GdkPixbuf *pixbuf; GtkTextMark *mark; gchar *filename; int width; int height; }; struct _GtkIMHtmlHr { GtkIMHtmlScalable scalable; GtkWidget *sep; }; typedef enum { GTK_IMHTML_NO_COLOURS = 1 << 0, GTK_IMHTML_NO_FONTS = 1 << 1, GTK_IMHTML_NO_COMMENTS = 1 << 2, GTK_IMHTML_NO_TITLE = 1 << 3, GTK_IMHTML_NO_NEWLINE = 1 << 4, GTK_IMHTML_NO_SIZES = 1 << 5, GTK_IMHTML_NO_SCROLL = 1 << 6, GTK_IMHTML_RETURN_LOG = 1 << 7, GTK_IMHTML_USE_POINTSIZE = 1 << 8 } GtkIMHtmlOptions; GtkType gtk_imhtml_get_type (void); GtkWidget* gtk_imhtml_new (void *, void *); void gtk_imhtml_set_adjustments (GtkIMHtml *imhtml, GtkAdjustment *hadj, GtkAdjustment *vadj); void gtk_imhtml_associate_smiley (GtkIMHtml *imhtml, gchar *sml, GtkIMHtmlSmiley *smiley); void gtk_imhtml_remove_smileys (GtkIMHtml *imhtml); void gtk_imhtml_show_smileys (GtkIMHtml *imhtml, gboolean show); void gtk_imhtml_show_comments (GtkIMHtml *imhtml, gboolean show); #define gtk_imhtml_append_text(x, y, z) \ gtk_imhtml_append_text_with_images(x, y, z, NULL) GString* gtk_imhtml_append_text_with_images (GtkIMHtml *imhtml, const gchar *text, GtkIMHtmlOptions options, GSList *images); void gtk_imhtml_clear (GtkIMHtml *imhtml); void gtk_imhtml_page_up (GtkIMHtml *imhtml); void gtk_imhtml_page_down (GtkIMHtml *imhtml); GtkIMHtmlScalable *gtk_imhtml_scalable_new(); GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename); void gtk_imhtml_image_free(GtkIMHtmlScalable *); void gtk_imhtml_image_scale(GtkIMHtmlScalable *, int, int); void gtk_imhtml_image_add_to(GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *); GtkIMHtmlScalable *gtk_imhtml_hr_new(); void gtk_imhtml_hr_free(GtkIMHtmlScalable *); void gtk_imhtml_hr_scale(GtkIMHtmlScalable *, int, int); void gtk_imhtml_hr_add_to(GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *); /* Search functions */ gboolean gtk_imhtml_search_find(GtkIMHtml *imhtml, const gchar *text); void gtk_imhtml_search_clear(GtkIMHtml *imhtml); #ifdef __cplusplus } #endif #endif