Mercurial > pidgin.yaz

--- a/src/Makefile.am	Fri Oct 03 23:14:13 2003 +0000
+++ b/src/Makefile.am	Fri Oct 03 23:19:21 2003 +0000
@@ -109,7 +109,6 @@
 	$(CORESOURCES) \
 	about.c \
 	away.c \
-	browser.c \
 	buddy_chat.c \
 	dialogs.c \
 	dnd-hints.c \
--- a/src/browser.c	Fri Oct 03 23:14:13 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,611 +0,0 @@
-/*
- * gaim
- *
- * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
- *
- * some code: (most in this file)
- * Copyright (C) 1996 Netscape Communications Corporation, all rights reserved.
- * Created: Jamie Zawinski <jwz@netscape.com>, 24-Dec-94.
- *
- * This program is free software; you can redistribute it and/or modify
- * it 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
- *
- * This code is mainly taken from Netscape's sample implementation of
- * their protocol.  Nifty.
- *
- */
-#include "gtkinternal.h"
-
-#include <gdk/gdkprivate.h>
-
-#include "debug.h"
-#include "notify.h"
-#include "prefs.h"
-#include "util.h"
-
-#ifndef _WIN32
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-static const char *progname = "gaim";
-static const char *expected_mozilla_version = "1.1";
-
-#define MOZILLA_VERSION_PROP   "_MOZILLA_VERSION"
-#define MOZILLA_LOCK_PROP      "_MOZILLA_LOCK"
-#define MOZILLA_COMMAND_PROP   "_MOZILLA_COMMAND"
-#define MOZILLA_RESPONSE_PROP  "_MOZILLA_RESPONSE"
-
-static GdkAtom GDKA_MOZILLA_VERSION = 0;
-static GdkAtom GDKA_MOZILLA_LOCK = 0;
-static GdkAtom GDKA_MOZILLA_COMMAND = 0;
-static GdkAtom GDKA_MOZILLA_RESPONSE = 0;
-
-static char *window_check_mozilla_version(Window);
-static const char *get_lock_data();
-static GdkFilterReturn netscape_response_cb(XEvent *, GdkEvent *, GdkWindow *);
-static gboolean netscape_command(const char *);
-
-static int netscape_lock;
-
-
-static Window VirtualRootWindowOfScreen(screen)
-Screen *screen;
-{
-	static Screen *save_screen = (Screen *) 0;
-	static Window root = (Window) 0;
-
-	if (screen != save_screen) {
-		Display *dpy = DisplayOfScreen(screen);
-		Atom __SWM_VROOT = None;
-		unsigned int i;
-		Window rootReturn, parentReturn, *children;
-		unsigned int numChildren;
-
-		root = RootWindowOfScreen(screen);
-
-		/* go look for a virtual root */
-		__SWM_VROOT = XInternAtom(dpy, "__SWM_VROOT", False);
-		if (XQueryTree(dpy, root, &rootReturn, &parentReturn, &children, &numChildren)) {
-			for (i = 0; i < numChildren; i++) {
-				Atom actual_type;
-				int actual_format;
-				unsigned long nitems, bytesafter;
-				Window *newRoot = (Window *) 0;
-
-				if (XGetWindowProperty(dpy, children[i],
-						       __SWM_VROOT, 0, 1, False, XA_WINDOW,
-						       &actual_type, &actual_format,
-						       &nitems, &bytesafter,
-						       (unsigned char **)&newRoot) == Success
-				    && newRoot) {
-					root = *newRoot;
-					break;
-				}
-			}
-			if (children)
-				XFree((char *)children);
-		}
-
-		save_screen = screen;
-	}
-
-	return root;
-}
-
-/* The following code is Copyright (C) 1989 X Consortium */
-
-static Window TryChildren();
-
-/* Find a window with WM_STATE, else return win itself, as per ICCCM */
-
-static Window GClientWindow(dpy, win)
-Display *dpy;
-Window win;
-{
-	Atom WM_STATE;
-	Atom type = None;
-	int format;
-	unsigned long nitems, after;
-	unsigned char *data;
-	Window inf;
-
-	WM_STATE = XInternAtom(dpy, "WM_STATE", True);
-	if (!WM_STATE)
-		return win;
-	XGetWindowProperty(dpy, win, WM_STATE, 0, 0, False, AnyPropertyType,
-			   &type, &format, &nitems, &after, &data);
-	if (type) {
-		XFree(data);
-		return win;
-	}
-
-	inf = TryChildren(dpy, win, WM_STATE);
-	if (!inf)
-		inf = win;
-
-	XFree(data);
-
-	return inf;
-}
-
-static
-Window TryChildren(dpy, win, WM_STATE)
-Display *dpy;
-Window win;
-Atom WM_STATE;
-{
-	Window root, parent;
-	Window *children;
-	unsigned int nchildren;
-	unsigned int i;
-	Atom type = None;
-	int format;
-	unsigned long nitems, after;
-	unsigned char *data;
-	Window inf = 0;
-
-	if (!XQueryTree(dpy, win, &root, &parent, &children, &nchildren))
-		return 0;
-	for (i = 0; !inf && (i < nchildren); i++) {
-		XGetWindowProperty(dpy, children[i], WM_STATE, 0, 0, False,
-				   AnyPropertyType, &type, &format, &nitems, &after, &data);
-		if (type)
-			inf = children[i];
-
-		XFree(data);
-	}
-	for (i = 0; !inf && (i < nchildren); i++)
-		inf = TryChildren(dpy, children[i], WM_STATE);
-	if (children)
-		XFree((char *)children);
-	return inf;
-}
-
-/* END X Consortium code */
-
-
-
-static void mozilla_remote_init_atoms()
-{
-	if (!GDKA_MOZILLA_VERSION)
-		GDKA_MOZILLA_VERSION = gdk_atom_intern(MOZILLA_VERSION_PROP, 0);
-	if (!GDKA_MOZILLA_LOCK)
-		GDKA_MOZILLA_LOCK = gdk_atom_intern(MOZILLA_LOCK_PROP, 0);
-	if (!GDKA_MOZILLA_COMMAND)
-		GDKA_MOZILLA_COMMAND = gdk_atom_intern(MOZILLA_COMMAND_PROP, 0);
-	if (!GDKA_MOZILLA_RESPONSE)
-		GDKA_MOZILLA_RESPONSE = gdk_atom_intern(MOZILLA_RESPONSE_PROP, 0);
-}
-
-static char *window_check_mozilla_version(Window window) {
-
-	Atom type;
-	int format;
-	unsigned long nitems, bytesafter;
-	unsigned char *version = 0;
-	gchar *retval = NULL;
-
-	if (XGetWindowProperty(gdk_display, window,
-					gdk_x11_atom_to_xatom(GDKA_MOZILLA_VERSION),
-					0, (65536 / sizeof(long)),
-					False, XA_STRING,
-					&type, &format, &nitems, &bytesafter,
-					&version) != Success) {
-		return NULL;
-	}
-
-	if (!version) {
-		return NULL;
-	}
-
-	retval = g_strdup(version);
-	XFree(version);
-
-	return retval;
-}
-
-static GdkWindow *mozilla_remote_find_window()
-{
-	int i;
-	Window root = VirtualRootWindowOfScreen(DefaultScreenOfDisplay(gdk_display));
-	Window root2, parent, *kids;
-	unsigned int nkids;
-	Window result = 0;
-	Window tenative = 0;
-	unsigned char *tenative_version = 0, *version = 0;
-	static GdkWindow *remote_window = NULL;
-
-	if (remote_window != NULL) {
-		version = window_check_mozilla_version(GDK_WINDOW_XID(remote_window));
-
-		if (version != NULL) {
-			g_free(version);
-			return remote_window;
-		}
-		g_free(version);
-
-		gdk_window_destroy(remote_window);
-		remote_window = NULL;
-	}
-
-	if (!XQueryTree(gdk_display, root, &root2, &parent, &kids, &nkids)) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "%s: XQueryTree failed on display %s\n",
-				   progname, DisplayString(gdk_display));
-		return NULL;
-	}
-
-	/* root != root2 is possible with virtual root WMs. */
-
-	if (!(kids && nkids)) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "%s: root window has no children on display %s\n",
-				   progname, DisplayString(gdk_display));
-		return NULL;
-	}
-
-	for (i = nkids - 1; i >= 0; i--) {
-		Window w = GClientWindow(gdk_display, kids[i]);
-
-        version = window_check_mozilla_version(w);
-
-		if (version == NULL) {
-			continue;
-		}
-
-		if (strcmp((char *)version, expected_mozilla_version) && !tenative) {
-			tenative = w;
-			tenative_version = version;
-			continue;
-		}
-
-		g_free(version);
-
-			result = w;
-			break;
-		}
-
-	XFree(kids);
-
-	if (result && tenative) {
-		gaim_debug(GAIM_DEBUG_WARNING, "browser",
-				   "%s: both version %s (0x%x) and version %s (%0x%x) "
-				   "are running. Using version %s.\n",
-				   progname, tenative_version, (unsigned int)tenative,
-				   expected_mozilla_version, (unsigned int)result,
-				   expected_mozilla_version);
-		XFree(tenative_version);
-		return gdk_window_foreign_new(result);
-	} else if (tenative) {
-		gaim_debug(GAIM_DEBUG_WARNING, "browser",
-				   "%s: expected version %s but found version %s (0x%x) "
-				   "instead.\n",
-				   progname, expected_mozilla_version,
-				   tenative_version, (unsigned int)tenative);
-		XFree(tenative_version);
-		return gdk_window_foreign_new(tenative);
-	} else if (result) {
-		return gdk_window_foreign_new(result);
-	} else {
-		gaim_debug(GAIM_DEBUG_ERROR, "%s: not running on display %s\n",
-				   progname, DisplayString(gdk_display));
-		return NULL;
-	}
-}
-
-
-static const char *get_lock_data() {
-	static char *lock_data = NULL;
-
-	if (lock_data == NULL) {
-		char hostname[HOST_NAME_MAX + 1] = {0};
-
-		if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) {
-			lock_data = g_strdup_printf("pid%d@%s", getpid(), hostname);
-		} else {
-			lock_data = g_strdup_printf("pid%d", getpid());
-		}
-	}
-
-	return lock_data;
-}
-
-#if 0
-static void mozilla_remote_obtain_lock(GdkWindow * window)
-{
-	gboolean locked = False;
-	const char *lock_data = get_lock_data();
-		GdkAtom actual_type;
-		gint actual_format;
-		gint nitems;
-		unsigned char *data = 0;
-
-	gdk_x11_grab_server();
-	if (!gdk_property_get(window, GDKA_MOZILLA_LOCK,
-					  gdk_x11_xatom_to_atom (XA_STRING), 0,
-					  (65536 / sizeof(long)), 0,
-				  &actual_type, &actual_format, &nitems, &data)) {
-
-			/* It's not now locked - lock it. */
-		gaim_debug(GAIM_DEBUG_MISC, "browser",
-				   "%s: writing " MOZILLA_LOCK_PROP " \"%s\" to 0x%x\n",
-				   progname, lock_data, (unsigned int)window);
-
-		gdk_property_change(window, GDKA_MOZILLA_LOCK,
-							gdk_x11_xatom_to_atom (XA_STRING),
-							8, PropModeReplace,
-							(unsigned char *)lock_data, strlen(lock_data));
-		locked = True;
-	}
-
-	if (data)
-		g_free(data);
-
-	gdk_x11_ungrab_server();
-}
-#endif
-
-static void mozilla_remote_free_lock(GdkWindow * window)
-{
-	int result = 0;
-	GdkAtom actual_type;
-	gint actual_format;
-	gint nitems;
-	unsigned char *data = 0;
-	const char *lock_data = get_lock_data();
-
-	gaim_debug(GAIM_DEBUG_MISC, "browser",
-			   "%s: deleting " MOZILLA_LOCK_PROP " \"%s\" from 0x%x\n",
-			   progname, lock_data, window);
-
-	result = gdk_property_get(window, GDKA_MOZILLA_LOCK,
-				  gdk_x11_xatom_to_atom (XA_STRING),
-				  0, (65536 / sizeof(long)),
-				  1, &actual_type, &actual_format, &nitems, &data);
-
-	if (result != TRUE) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "%s: Unable to read and delete " MOZILLA_LOCK_PROP
-				   " property\n", progname);
-		return;
-	} else if (!data || !*data) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "%s: Invalid data on " MOZILLA_LOCK_PROP
-				   " of window 0x%x\n", progname, window);
-		return;
-	} else if (strcmp((char *)data, lock_data)) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "%s: " MOZILLA_LOCK_PROP " was stolen! Expected \"%s\", "
-				   "saw \"%s\"!\n", progname, lock_data, data);
-		return;
-	}
-
-	XFree(data);
-}
-
-static GdkFilterReturn netscape_response_cb(XEvent *event, GdkEvent *translated, GdkWindow *window)
-{
-	Atom actual_type, mozilla_response;
-	Window xid;
-	int actual_format;
-	unsigned long nitems, bytes_after;
-	unsigned char *data = 0;
-
-	if (window == NULL || GDK_WINDOW_OBJECT(window)->destroyed) {
-		gaim_notify_error(NULL, NULL,
-						  _("Communication with the browser failed. "
-							"Please close all windows and try again."), NULL);
-		gaim_debug(GAIM_DEBUG_WARNING, "browser",
-				   "netscape_response_cb called with NULL window.\n");
-		return GDK_FILTER_CONTINUE;
-	}
-
-	mozilla_response = gdk_x11_atom_to_xatom(GDKA_MOZILLA_RESPONSE);
-    xid = GDK_WINDOW_XID(window);
-
-	/* If the event isn't what we want then let gtk handle it */
-	if (event->xany.type != PropertyNotify ||
-		event->xproperty.state != PropertyNewValue ||
-		event->xproperty.window != xid ||
-		event->xproperty.atom != mozilla_response) {
-		return GDK_FILTER_CONTINUE;
-	}
-
-	if (XGetWindowProperty (gdk_display, xid, mozilla_response,
-							 0, (65536 / sizeof (long)),
-							 True,
-							 XA_STRING,
-							 &actual_type, &actual_format,
-							 &nitems, &bytes_after,
-							 &data) != Success
-		|| data == NULL || (data[0] != '1' && data[0] != '2')) {
-
-		gaim_notify_error(NULL, NULL,
-						  _("Communication with the browser failed. "
-							"Please close all windows and try again."), NULL);
-	}
-
-    if (data[0] == '1') {
-		/* Netscape isn't ready yet */
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "Remote Netscape window isn't ready yet.\n");
-		return GDK_FILTER_REMOVE;
-	}
-
-	if (data[0] == '2') {
-		/* Yay! It worked */
-		gaim_debug(GAIM_DEBUG_INFO, "browser",
-				   "Successfully sent command to remote Netscape window.\n");
-	}
-
-	gdk_window_remove_filter(window, (GdkFilterFunc) netscape_response_cb, window);
-	mozilla_remote_free_lock(window);
-	netscape_lock = 0;
-	return GDK_FILTER_REMOVE;
-}
-
-static void mozilla_remote_command(GdkWindow * window, const char *command, Bool raise_p)
-{
-	char *new_command = 0;
-
-	/* The -noraise option is implemented by passing a "noraise" argument
-	   to each command to which it should apply.
-	 */
-	if (!raise_p) {
-		char *close;
-		new_command = g_malloc(strlen(command) + 20);
-		strcpy(new_command, command);
-		close = strrchr(new_command, ')');
-		if (close)
-			strcpy(close, ", noraise)");
-		else
-			strcat(new_command, "(noraise)");
-		command = new_command;
-	}
-
-	gaim_debug(GAIM_DEBUG_MISC, "browser",
-			   "%s: Writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x\n",
-			   progname, command, window);
-
-	gdk_property_change(window, GDKA_MOZILLA_COMMAND,
-			    gdk_x11_xatom_to_atom (XA_STRING),
-			    8, GDK_PROP_MODE_REPLACE, (unsigned char *)command, strlen(command));
-
-	gdk_window_add_filter(window, (GdkFilterFunc) netscape_response_cb, window);
-}
-
-static gboolean netscape_command(const char *command)
-{
- 	GdkWindow *window = NULL;
-
- 	if (netscape_lock) {
-		gaim_debug(GAIM_DEBUG_WARNING, "browser",
-				   "netscape_command() is currently in use.\n");
-		return FALSE;
-	}
-
-	netscape_lock = 1;
-
-	mozilla_remote_init_atoms();
-	window = mozilla_remote_find_window();
-
-	if (window == NULL || (GDK_WINDOW_OBJECT(window)->destroyed == TRUE)) {
-		gaim_debug(GAIM_DEBUG_ERROR, "browser",
-				   "Remote window absent or unsuitable.\n");
-		netscape_lock = 0;
-		return FALSE;
-	}
-
-	mozilla_remote_command(window, command, False);
-
-	netscape_lock = 0;
-	return TRUE;
-}
-#endif /* _WIN32 */
-
-void *
-gaim_gtk_notify_uri(const char *uri)
-{
-#ifndef _WIN32
-	char *command = NULL;
-	GError *error = NULL;
-	const char *web_browser;
-
-	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
-
-	if (!strcmp(web_browser, "netscape")) {
-		char *args = NULL;
-
-		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
-			args = g_strdup_printf("OpenURL(%s, new-window)", uri);
-		else
-			args = g_strdup_printf("OpenURL(%s)", uri);
-
-		if (netscape_command(args)) {
-			g_free(args);
-			return NULL;
-		}
-
-		/* if netscape is running ...
-		command = g_strdup_printf("netscape -remote %s", args); */
-
-		command = g_strdup_printf("netscape \"%s\"", uri);
-		g_free(args);
-	}
-	else if (!strcmp(web_browser, "opera")) {
-		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
-			command = g_strdup_printf("opera -newwindow \"%s\"", uri);
-		else
-			command = g_strdup_printf("opera \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "kfmclient")) {
-		command = g_strdup_printf("kfmclient openURL \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "galeon")) {
-		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
-			command = g_strdup_printf("galeon -w \"%s\"", uri);
-		else
-			command = g_strdup_printf("galeon \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "mozilla")) {
-		command = g_strdup_printf("mozilla \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "custom")) {
-		const char *web_command;
-
-		web_command = gaim_prefs_get_string("/gaim/gtk/browsers/command");
-
-		if (web_command == NULL || *web_command == '\0') {
-			gaim_notify_error(NULL, NULL, _("Unable to open URL"),
-							  _("The 'Manual' browser command has been "
-								"chosen, but no command has been set."));
-			return NULL;
-		}
-
-		if (strstr(web_command, "%s"))
-			command = gaim_strreplace(web_command, "%s", uri);
-		else {
-			/*
-			 * There is no "%s" in the browser command.  Assume the user
-			 * wanted the URL tacked on to the end of the command.
-			 */
-			command = g_strdup_printf("%s %s", web_command, uri);
-		}
-	}
-
-	if (!gaim_program_is_valid(command)) {
-		gchar *tmp = g_strdup_printf(_("The browser \"%s\" is invalid."),
-						command);
-		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
-		g_free(tmp);
-
-	} else if (!g_spawn_command_line_async(command, &error)) {
-		char *tmp = g_strdup_printf(
-				_("Error launching \"command\": %s"),
-				error->message);
-
-		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
-
-		g_free(tmp);
-		g_error_free(error);
- 	}
-
-	g_free(command);
-
-#else
-	ShellExecute(NULL, NULL, uri, NULL, ".\\", 0);
-#endif
-
-	return NULL;
-}
--- a/src/gtknotify.c	Fri Oct 03 23:14:13 2003 +0000
+++ b/src/gtknotify.c	Fri Oct 03 23:19:21 2003 +0000
@@ -377,6 +377,81 @@
 		gtk_widget_destroy(GTK_WIDGET(ui_handle));
 }

+static void *
+gaim_gtk_notify_uri(const char *uri)
+{
+#ifndef _WIN32
+	char *command = NULL;
+	GError *error = NULL;
+	const char *web_browser;
+
+	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
+
+	if (!strcmp(web_browser, "netscape")) {
+		command = g_strdup_printf("netscape \"%s\"", uri);
+	} else if (!strcmp(web_browser, "opera")) {
+		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
+			command = g_strdup_printf("opera -newwindow \"%s\"", uri);
+		else
+			command = g_strdup_printf("opera \"%s\"", uri);
+	} else if (!strcmp(web_browser, "kfmclient")) {
+		command = g_strdup_printf("kfmclient openURL \"%s\"", uri);
+	} else if (!strcmp(web_browser, "galeon")) {
+		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
+			command = g_strdup_printf("galeon -w \"%s\"", uri);
+		else
+			command = g_strdup_printf("galeon \"%s\"", uri);
+	} else if (!strcmp(web_browser, "mozilla")) {
+		command = g_strdup_printf("mozilla \"%s\"", uri);
+	} else if (!strcmp(web_browser, "custom")) {
+		const char *web_command;
+
+		web_command = gaim_prefs_get_string("/gaim/gtk/browsers/command");
+
+		if (web_command == NULL || *web_command == '\0') {
+			gaim_notify_error(NULL, NULL, _("Unable to open URL"),
+							  _("The 'Manual' browser command has been "
+								"chosen, but no command has been set."));
+			return NULL;
+		}
+
+		if (strstr(web_command, "%s"))
+			command = gaim_strreplace(web_command, "%s", uri);
+		else {
+			/*
+			 * There is no "%s" in the browser command.  Assume the user
+			 * wanted the URL tacked on to the end of the command.
+			 */
+			command = g_strdup_printf("%s %s", web_command, uri);
+		}
+	}
+
+	if (!gaim_program_is_valid(command)) {
+		gchar *tmp = g_strdup_printf(_("The browser \"%s\" is invalid."),
+						command);
+		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
+		g_free(tmp);
+
+	} else if (!g_spawn_command_line_async(command, &error)) {
+		char *tmp = g_strdup_printf(
+				_("Error launching \"command\": %s"),
+				error->message);
+
+		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
+
+		g_free(tmp);
+		g_error_free(error);
+	}
+
+	g_free(command);
+
+#else
+	ShellExecute(NULL, NULL, uri, NULL, ".\\", 0);
+#endif
+
+	return NULL;
+}
+
 static GaimNotifyUiOps ops =
 {
 	gaim_gtk_notify_message,
--- a/src/ui.h	Fri Oct 03 23:14:13 2003 +0000
+++ b/src/ui.h	Fri Oct 03 23:19:21 2003 +0000
@@ -118,9 +118,6 @@
 extern void purge_away_queue(GSList**);
 extern void do_im_back(GtkWidget *w, GtkWidget *x);

-/* Functions in browser.c */
-void *gaim_gtk_notify_uri(const char *uri);
-
 /* Functions in dialogs.c */
 extern void alias_dialog_bud(GaimBuddy *);
 extern void alias_dialog_blist_chat(GaimChat *);