comparison pidgin/gtknotify.c @ 31013:0accc8adb18a

merge of '2f6318bd834113559a405ec68cdb178f2180b680' and '64e02b98551e11e093e4649f1516f3aceaa321e2'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 26 Sep 2010 20:16:15 +0000
parents 70d8e2e71552
children c5ba7dd399fa 3eaf954631fa 917c597beb97
comparison
equal deleted inserted replaced
31012:7b761c8601f7 31013:0accc8adb18a
1365 } 1365 }
1366 else 1366 else
1367 command = g_strdup_printf("opera %s", escaped); 1367 command = g_strdup_printf("opera %s", escaped);
1368 1368
1369 } 1369 }
1370 else if (!strcmp(web_browser, "google-chrome"))
1371 {
1372 /* Google Chrome doesn't have command-line arguments that control the
1373 * opening of links from external calls. This is controlled solely from
1374 * a preference within Google Chrome. */
1375 command = g_strdup_printf("google-chrome %s", escaped);
1376 }
1377 else if (!strcmp(web_browser, "chrome"))
1378 {
1379 /* Chromium doesn't have command-line arguments that control the
1380 * opening of links from external calls. This is controlled solely from
1381 * a preference within Chromium. */
1382 command = g_strdup_printf("chrome %s", escaped);
1383 }
1384 else if (!strcmp(web_browser, "chromium-browser"))
1385 {
1386 /* Chromium doesn't have command-line arguments that control the
1387 * opening of links from external calls. This is controlled solely from
1388 * a preference within Chromium. */
1389 command = g_strdup_printf("chromium-browser %s", escaped);
1390 }
1370 else if (!strcmp(web_browser, "custom")) 1391 else if (!strcmp(web_browser, "custom"))
1371 { 1392 {
1372 const char *web_command; 1393 const char *web_command;
1373 1394
1374 web_command = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"); 1395 web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command");
1375 1396
1376 if (web_command == NULL || *web_command == '\0') 1397 if (web_command == NULL || *web_command == '\0')
1377 { 1398 {
1378 purple_notify_error(NULL, NULL, _("Unable to open URL"), 1399 purple_notify_error(NULL, NULL, _("Unable to open URL"),
1379 _("The 'Manual' browser command has been " 1400 _("The 'Manual' browser command has been "