Mercurial > pidgin.yaz
changeset 733:8f3bcde94e2c
[gaim-migrate @ 743]
I like stuff.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Mon, 21 Aug 2000 20:32:50 +0000 |
| parents | 6609b5a16b38 |
| children | a42e259c423f |
| files | src/browser.c src/buddy.c src/gaim.h src/prefs.c |
| diffstat | 4 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/browser.c Mon Aug 21 20:26:56 2000 +0000 +++ b/src/browser.c Mon Aug 21 20:32:50 2000 +0000 @@ -632,6 +632,7 @@ } void open_url(GtkWidget *w, char *url) { + if (web_browser == BROWSER_NETSCAPE) { char *command = g_malloc(1024); @@ -657,6 +658,10 @@ } else { gtk_timeout_add(1000, (GtkFunction)clean_pid, NULL); } +#ifdef USE_GNOME + } else if (web_browser == BROWSER_GNOME) { + gnome_url_show(url); +#endif /* USE_GNOME */ } else if (web_browser == BROWSER_MANUAL) { pid_t pid; @@ -704,6 +709,8 @@ netscape_command(command); g_free(command); + } else { + open_url(w, url); } }
--- a/src/buddy.c Mon Aug 21 20:26:56 2000 +0000 +++ b/src/buddy.c Mon Aug 21 20:32:50 2000 +0000 @@ -67,6 +67,7 @@ #include "pixmaps/add_small.xpm" #include "pixmaps/import_small.xpm" +#include "pixmaps/export_small.xpm" #include "pixmaps/close_small.xpm" #include "pixmaps/exit_small.xpm" @@ -1850,14 +1851,14 @@ gaim_new_item_with_pixmap(menu, _("Join A Chat"), add_small_xpm, GTK_SIGNAL_FUNC(chat_callback)); gaim_seperator(menu); gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, GTK_SIGNAL_FUNC(import_callback)); - gaim_new_item_with_pixmap(menu, _("Export Buddy List"), add_small_xpm,GTK_SIGNAL_FUNC(export_callback)); + gaim_new_item_with_pixmap(menu, _("Export Buddy List"), export_small_xpm,GTK_SIGNAL_FUNC(export_callback)); if (!(general_options & OPT_GEN_REGISTERED)) { gaim_seperator(menu); gaim_new_item_with_pixmap(menu, _("Register"), add_small_xpm, GTK_SIGNAL_FUNC(gaimreg_callback)); } gaim_seperator(menu); - gaim_new_item_with_pixmap(menu, _("Signoff"), add_small_xpm, GTK_SIGNAL_FUNC(signoff)); + gaim_new_item_with_pixmap(menu, _("Signoff"), logout_icon_xpm, GTK_SIGNAL_FUNC(signoff)); #ifndef USE_APPLET gaim_new_item_with_pixmap(menu, _("Quit"), exit_small_xpm, GTK_SIGNAL_FUNC(do_quit));
--- a/src/gaim.h Mon Aug 21 20:26:56 2000 +0000 +++ b/src/gaim.h Mon Aug 21 20:32:50 2000 +0000 @@ -54,6 +54,7 @@ #define BROWSER_KFM 1 #define BROWSER_MANUAL 2 #define BROWSER_INTERNAL 3 +#define BROWSER_GNOME 4 #define PERMIT_ALL 1 #define PERMIT_NONE 2 @@ -400,7 +401,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 738 $" +#define REVISION "gaim:$Revision: 743 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc"
--- a/src/prefs.c Mon Aug 21 20:26:56 2000 +0000 +++ b/src/prefs.c Mon Aug 21 20:32:50 2000 +0000 @@ -1328,6 +1328,9 @@ gtk_widget_show(box); label = gtk_label_new(_("All options take effect immediately unless otherwise noted.")); +#ifdef USE_GNOME + opt = browser_radio(_("GNOME URL Handler"), BROWSER_GNOME, box, opt); +#endif /* USE_GNOME */ gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5); gtk_widget_show(label);