Mercurial > pidgin.yaz
changeset 22210:a276345c21a0
merge of '0f37c6a913d5207fa0fa327f5b11b215c7d35926'
and '5f619caa5426e6b4e0d1823858310195ce7a994d'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sat, 26 Jan 2008 17:14:59 +0000 |
| parents | c77098cebf23 (diff) a0d3cabfdee0 (current diff) |
| children | eddcf0f2da51 |
| files | |
| diffstat | 4 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Fri Jan 25 20:43:15 2008 +0000 +++ b/libpurple/protocols/jabber/auth.c Sat Jan 26 17:14:59 2008 +0000 @@ -344,6 +344,7 @@ * Doing otherwise means that simply compiling with SASL support renders the client unable to connect to servers * which would connect without issue otherwise. -evands */ + js->auth_type = JABBER_AUTH_IQ_AUTH; jabber_auth_start_old(js); return; }
--- a/libpurple/protocols/jabber/si.c Fri Jan 25 20:43:15 2008 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Jan 26 17:14:59 2008 +0000 @@ -1089,7 +1089,7 @@ } else { /* we've got multiple resources, we need to pick one to send to */ GList *l; - char *msg = g_strdup_printf(_("Please select which resource of %s you would like to send a file to"), xfer->who); + char *msg = g_strdup_printf(_("Please select the resource of %s to which you would like to send a file"), xfer->who); PurpleRequestFields *fields = purple_request_fields_new(); PurpleRequestField *field = purple_request_field_choice_new("resource", _("Resource"), 0); PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
--- a/pidgin/gtknotify.c Fri Jan 25 20:43:15 2008 +0000 +++ b/pidgin/gtknotify.c Sat Jan 26 17:14:59 2008 +0000 @@ -1058,7 +1058,12 @@ /* if they are running gnome, use the gnome web browser */ if (purple_running_gnome() == TRUE) { - command = g_strdup_printf("gnome-open %s", escaped); + char *tmp = g_find_program_in_path("xdg-open"); + if (tmp == NULL) + command = g_strdup_printf("gnome-open %s", escaped); + else + command = g_strdup_printf("xdg-open %s", escaped); + g_free(tmp); } else if (purple_running_osx() == TRUE) { @@ -1074,6 +1079,10 @@ else command = g_strdup_printf("%s %s", web_browser, escaped); } + else if (!strcmp(web_browser, "xdg-open")) + { + command = g_strdup_printf("xdg-open %s", escaped); + } else if (!strcmp(web_browser, "gnome-open")) { command = g_strdup_printf("gnome-open %s", escaped);
--- a/pidgin/gtkprefs.c Fri Jan 25 20:43:15 2008 +0000 +++ b/pidgin/gtkprefs.c Sat Jan 26 17:14:59 2008 +0000 @@ -1369,6 +1369,7 @@ {N_("Netscape"), "netscape"}, {N_("Mozilla"), "mozilla"}, {N_("Konqueror"), "kfmclient"}, + {N_("Desktop Default"), "xdg-open"}, {N_("GNOME Default"), "gnome-open"}, {N_("Galeon"), "galeon"}, {N_("Firefox"), "firefox"}, @@ -1391,6 +1392,14 @@ browsers = g_list_prepend(browsers, (gpointer)_(possible_browsers[i].name)); if(browser_setting && !strcmp(possible_browsers[i].command, browser_setting)) browser_setting = NULL; + /* If xdg-open is valid, prefer it over gnome-open and skip forward */ + if(!strcmp(possible_browsers[i].command, "xdg-open")) { + if (browser_setting && !strcmp("gnome-open", browser_setting)) { + purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", possible_browsers[i].command); + browser_setting = NULL; + } + i++; + } } }