Mercurial > pidgin.yaz
diff src/browser.c @ 5436:ad445074d239
[gaim-migrate @ 5818]
Another big commit. Ugh. I need a very smart regexp.
Core/UI split do_error_dialog(), and soon the mail dialogs! Yay! This
should work without problems at all, but standard disclaimer..
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Sun, 18 May 2003 19:59:02 +0000 |
parents | a2f26666de42 |
children | d1524728d491 |
line wrap: on
line diff
--- a/src/browser.c Sun May 18 19:13:21 2003 +0000 +++ b/src/browser.c Sun May 18 19:59:02 2003 +0000 @@ -49,6 +49,7 @@ #include <gtk/gtk.h> #include <gdk/gdkprivate.h> #include "gaim.h" +#include "notify.h" #ifndef _WIN32 @@ -424,8 +425,9 @@ unsigned char *data = 0; if (window == NULL || GDK_WINDOW_OBJECT(window)->destroyed) { - do_error_dialog(_("Communication with the browser failed. Please close all " - "windows and try again."), NULL, GAIM_ERROR); + 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; @@ -451,8 +453,9 @@ &data) != Success || data == NULL || (data[0] != '1' && data[0] != '2')) { - do_error_dialog(_("Communication with the browser failed. Please close all " - "windows and try again."), NULL, GAIM_ERROR); + gaim_notify_error(NULL, NULL, + _("Communication with the browser failed. " + "Please close all windows and try again."), NULL); } if (data[0] == '1') { @@ -584,7 +587,11 @@ char *space_free_url = NULL; if (!web_command[0]) { - do_error_dialog(_("Unable to launch your browser because the 'Manual' browser command has been chosen, but no command has been set."), NULL, GAIM_ERROR); + gaim_notify_error(NULL, NULL, + _("Unable to launch your browser because " + "the 'Manual' browser command has been " + "chosen, but no command has been set."), + NULL); return; } @@ -600,7 +607,7 @@ if (g_spawn_command_line_async(command, &error) == FALSE) { char *tmp = g_strdup_printf(_("There was an error launching your chosen browser: %s"), error->message); - do_error_dialog(tmp, NULL, GAIM_ERROR); + gaim_notify_error(NULL, NULL, tmp, NULL); g_free(tmp); g_error_free(error); }