comparison: pidgin/gtkprefs.c
pidgin/gtkprefs.c
- changeset 22330
- c9ac9657f47a
- parent 22229
- 8560c89895a9
- child 22404
- 145dfc6b5f29
- child 22405
- f56b65b25860
equal
deleted
inserted
replaced
| 22329:cb93a3d50585 | 22330:c9ac9657f47a |
|---|---|
| 1367 {N_("Seamonkey"), "seamonkey"}, | 1367 {N_("Seamonkey"), "seamonkey"}, |
| 1368 {N_("Opera"), "opera"}, | 1368 {N_("Opera"), "opera"}, |
| 1369 {N_("Netscape"), "netscape"}, | 1369 {N_("Netscape"), "netscape"}, |
| 1370 {N_("Mozilla"), "mozilla"}, | 1370 {N_("Mozilla"), "mozilla"}, |
| 1371 {N_("Konqueror"), "kfmclient"}, | 1371 {N_("Konqueror"), "kfmclient"}, |
| 1372 {N_("Desktop Default"), "xdg-open"}, | |
| 1372 {N_("GNOME Default"), "gnome-open"}, | 1373 {N_("GNOME Default"), "gnome-open"}, |
| 1373 {N_("Galeon"), "galeon"}, | 1374 {N_("Galeon"), "galeon"}, |
| 1374 {N_("Firefox"), "firefox"}, | 1375 {N_("Firefox"), "firefox"}, |
| 1375 {N_("Firebird"), "mozilla-firebird"}, | 1376 {N_("Firebird"), "mozilla-firebird"}, |
| 1376 {N_("Epiphany"), "epiphany"} | 1377 {N_("Epiphany"), "epiphany"} |
| 1389 browsers = g_list_prepend(browsers, | 1390 browsers = g_list_prepend(browsers, |
| 1390 possible_browsers[i].command); | 1391 possible_browsers[i].command); |
| 1391 browsers = g_list_prepend(browsers, (gpointer)_(possible_browsers[i].name)); | 1392 browsers = g_list_prepend(browsers, (gpointer)_(possible_browsers[i].name)); |
| 1392 if(browser_setting && !strcmp(possible_browsers[i].command, browser_setting)) | 1393 if(browser_setting && !strcmp(possible_browsers[i].command, browser_setting)) |
| 1393 browser_setting = NULL; | 1394 browser_setting = NULL; |
| 1395 /* If xdg-open is valid, prefer it over gnome-open and skip forward */ | |
| 1396 if(!strcmp(possible_browsers[i].command, "xdg-open")) { | |
| 1397 if (browser_setting && !strcmp("gnome-open", browser_setting)) { | |
| 1398 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", possible_browsers[i].command); | |
| 1399 browser_setting = NULL; | |
| 1400 } | |
| 1401 i++; | |
| 1402 } | |
| 1394 } | 1403 } |
| 1395 } | 1404 } |
| 1396 | 1405 |
| 1397 if(browser_setting) | 1406 if(browser_setting) |
| 1398 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "custom"); | 1407 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "custom"); |
