Mercurial > pidgin
comparison src/gtknotify.c @ 9399:0c31db6bde62
[gaim-migrate @ 10213]
Nathan Conrad pointed out that my previous change broke Mozilla 1.7.
This should fix that. Lemme know if it doesn't.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 25 Jun 2004 23:12:45 +0000 |
parents | 5667b1cdcb53 |
children | 7b48e7c07bcf |
comparison
equal
deleted
inserted
replaced
9398:245fa201ad6c | 9399:0c31db6bde62 |
---|---|
536 } | 536 } |
537 else if (!strcmp(web_browser, "mozilla") || | 537 else if (!strcmp(web_browser, "mozilla") || |
538 !strcmp(web_browser, "mozilla-firebird") || | 538 !strcmp(web_browser, "mozilla-firebird") || |
539 !strcmp(web_browser, "firefox")) | 539 !strcmp(web_browser, "firefox")) |
540 { | 540 { |
541 char *args = ""; | |
542 | |
541 command = g_strdup_printf("%s \"%s\"", web_browser, uri); | 543 command = g_strdup_printf("%s \"%s\"", web_browser, uri); |
542 | 544 |
545 /* | |
546 * Firefox 0.9 and higher require a "-a firefox" option when | |
547 * using -remote commands. This breaks older versions of | |
548 * mozilla. So we include this other handly little string | |
549 * when calling firefox. If the API for remote calls changes | |
550 * any more in firefox then firefox should probably be split | |
551 * apart from mozilla-firebird and mozilla... but this is good | |
552 * for now. | |
553 */ | |
554 if (!strcmp(web_browser, "firefox")) | |
555 args = "-a firefox"; | |
556 | |
543 if (place == GAIM_BROWSER_NEW_WINDOW) | 557 if (place == GAIM_BROWSER_NEW_WINDOW) |
544 { | 558 remote_command = g_strdup_printf("%s %s -remote " |
545 remote_command = g_strdup_printf("%s -a firefox -remote " | |
546 "\"openURL(\"%s\",new-window)\"", | 559 "\"openURL(\"%s\",new-window)\"", |
547 web_browser, uri); | 560 web_browser, args, uri); |
548 } | |
549 else if (place == GAIM_BROWSER_NEW_TAB) | 561 else if (place == GAIM_BROWSER_NEW_TAB) |
550 { | 562 remote_command = g_strdup_printf("%s %s -remote " |
551 remote_command = g_strdup_printf("%s -a firefox -remote " | |
552 "\"openURL(\"%s\",new-tab)\"", | 563 "\"openURL(\"%s\",new-tab)\"", |
553 web_browser, uri); | 564 web_browser, args, uri); |
554 } | |
555 else if (place == GAIM_BROWSER_CURRENT) | 565 else if (place == GAIM_BROWSER_CURRENT) |
556 { | 566 remote_command = g_strdup_printf("%s %s -remote " |
557 remote_command = g_strdup_printf("%s -a firefox -remote " | |
558 "\"openURL(\"%s\")\"", | 567 "\"openURL(\"%s\")\"", |
559 web_browser, uri); | 568 web_browser, args, uri); |
560 } | |
561 } | 569 } |
562 else if (!strcmp(web_browser, "custom")) | 570 else if (!strcmp(web_browser, "custom")) |
563 { | 571 { |
564 const char *web_command; | 572 const char *web_command; |
565 | 573 |