gaim/gaim

FT dialog "Open" works w/ non-ASCII paths (win32)
oldstatus
2005-05-15, Daniel Atallah
225748167155
Parents 4d99f8de26ba
Children 9ebfb44e8856
FT dialog "Open" works w/ non-ASCII paths (win32)
1 files changed, 40 insertions(+), 19 deletions(-)
  • +40 -19
    src/gtkft.c
    • --- a/src/gtkft.c Sun May 15 20:17:37 2005 -0400
    +++ b/src/gtkft.c Sun May 15 20:46:29 2005 -0400
    @@ -293,11 +293,11 @@
    gtk_widget_show(dialog->remove_button);
    #ifdef _WIN32 /* Only supported in Win32 right now */
    - if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
    - gtk_widget_set_sensitive(dialog->open_button, TRUE);
    - } else {
    - gtk_widget_set_sensitive(dialog->open_button, FALSE);
    - }
    + if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
    + gtk_widget_set_sensitive(dialog->open_button, TRUE);
    + } else {
    + gtk_widget_set_sensitive(dialog->open_button, FALSE);
    + }
    #endif
    gtk_widget_set_sensitive(dialog->pause_button, FALSE);
    gtk_widget_set_sensitive(dialog->resume_button, FALSE);
    @@ -407,20 +407,41 @@
    open_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
    {
    #ifdef _WIN32 /* Only supported in Win32 right now */
    - int code = (int)ShellExecute(NULL, NULL,
    - gaim_xfer_get_local_filename(dialog->selected_xfer),
    - NULL, NULL, SW_SHOW);
    - if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC)
    - {
    - gaim_notify_error(NULL, NULL,
    - _("There is no application configured to open this type of file."), NULL);
    - }
    - else if (code < 32)
    - {
    - gaim_notify_error(NULL, NULL,
    - _("An error occurred while opening the file."), NULL);
    - gaim_debug_warning("ft", "filename: %s; code: %d\n", gaim_xfer_get_local_filename(dialog->selected_xfer), code);
    - }
    + int code;
    + if (G_WIN32_HAVE_WIDECHAR_API ()) {
    + wchar_t *wc_filename = g_utf8_to_utf16(
    + gaim_xfer_get_local_filename(
    + dialog->selected_xfer),
    + -1, NULL, NULL, NULL);
    +
    + code = (int) ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL,
    + SW_SHOW);
    +
    + g_free(wc_filename);
    + } else {
    + char *l_filename = g_locale_from_utf8(
    + gaim_xfer_get_local_filename(
    + dialog->selected_xfer),
    + -1, NULL, NULL, NULL);
    +
    + code = (int) ShellExecuteA(NULL, NULL, l_filename, NULL, NULL,
    + SW_SHOW);
    +
    + g_free(l_filename);
    + }
    +
    + if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC)
    + {
    + gaim_notify_error(NULL, NULL,
    + _("There is no application configured to open this type of file."), NULL);
    + }
    + else if (code < 32)
    + {
    + gaim_notify_error(NULL, NULL,
    + _("An error occurred while opening the file."), NULL);
    + gaim_debug_warning("ft", "filename: %s; code: %d\n",
    + gaim_xfer_get_local_filename(dialog->selected_xfer), code);
    + }
    #endif
    }