Mercurial > pidgin
changeset 3320:26130b6a04db
[gaim-migrate @ 3338]
Added Mozilla as a browser, and changed KFM to Konqueror.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 17 Jun 2002 00:10:34 +0000 |
| parents | 3a05fcb133c4 |
| children | 1a1a4243a12c |
| files | src/browser.c src/dialogs.c src/prefs.c src/ui.h |
| diffstat | 4 files changed, 23 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/browser.c Sun Jun 16 20:03:31 2002 +0000 +++ b/src/browser.c Mon Jun 17 00:10:34 2002 +0000 @@ -586,22 +586,31 @@ char command[1024]; if (web_browser == BROWSER_OPERA) { - args[0] = g_strdup("opera"); - args[1] = g_strdup("-newwindow"); + args[0] = "opera"; + args[1] = "-newwindow"; args[2] = url; args[3] = NULL; - } else if (web_browser == BROWSER_KFM) { - args[0] = g_strdup("kfmclient"); - args[1] = g_strdup("openURL"); + } else if (web_browser == BROWSER_KONQ) { + args[0] = "kfmclient"; + args[1] = "openURL"; args[2] = url; args[3] = NULL; } else if (web_browser == BROWSER_GALEON) { - args[0] = g_strdup("galeon"); + args[0] = "galeon"; + if (misc_options & OPT_MISC_BROWSER_POPUP) { + args[1] = "-w"; + args[2] = url; + args[3] = NULL; + } else { + args[1] = url; + args[2] = NULL; + } + } else if (web_browser == BROWSER_MOZILLA) { + args[0] = "mozilla"; args[1] = url; args[2] = NULL; } else if (web_browser == BROWSER_MANUAL) { g_snprintf(command, sizeof(command), web_command, url); - args[0] = "sh"; args[1] = "-c"; args[2] = command;
--- a/src/dialogs.c Sun Jun 16 20:03:31 2002 +0000 +++ b/src/dialogs.c Mon Jun 17 00:10:34 2002 +0000 @@ -4285,9 +4285,9 @@ button_box = gtk_hbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(button), button_box); - button_box_2 = gtk_vbox_new(TRUE, 0); - - gtk_box_pack_start(GTK_BOX(button_box), button_box_2, FALSE, FALSE, 0); + button_box_2 = gtk_vbox_new(FALSE, 0); + + gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0); gtk_widget_show(button_box_2); gtk_widget_show(button_box); if (dispstyle == 2 || dispstyle == 0) {
--- a/src/prefs.c Sun Jun 16 20:03:31 2002 +0000 +++ b/src/prefs.c Mon Jun 17 00:10:34 2002 +0000 @@ -288,9 +288,10 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5); gtk_widget_show(vbox); - opt = browser_radio(_("KFM"), BROWSER_KFM, vbox, NULL); + opt = browser_radio(_("Konqueror"), BROWSER_KONQ, vbox, NULL); opt = browser_radio(_("Opera"), BROWSER_OPERA, vbox, opt); opt = browser_radio(_("Netscape"), BROWSER_NETSCAPE, vbox, opt); + opt = browser_radio(_("Mozilla"), BROWSER_MOZILLA, vbox, opt); new_window = gaim_button(_("Pop up new window by default"), &misc_options, OPT_MISC_BROWSER_POPUP, vbox);
--- a/src/ui.h Sun Jun 16 20:03:31 2002 +0000 +++ b/src/ui.h Mon Jun 17 00:10:34 2002 +0000 @@ -55,12 +55,13 @@ #define DEFAULT_FONT_FACE "helvetica" #define BROWSER_NETSCAPE 0 -#define BROWSER_KFM 1 +#define BROWSER_KONQ 1 #define BROWSER_MANUAL 2 /*#define BROWSER_INTERNAL 3*/ #define BROWSER_GNOME 4 #define BROWSER_OPERA 5 #define BROWSER_GALEON 6 +#define BROWSER_MOZILLA 7 #define FACE_ANGEL 0 #define FACE_BIGSMILE 1