← Back to branch summary

~ubuntu-branches/debian/stretch/libgnome/stretch

« back to all changes in this revision

Viewing changes to libgnome/dllmain.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Josselin Mouette, Luca Bruno
  • Date: 2009-04-28 12:57:02 UTC
  • mfrom: (1.2.21 upstream)
  • Revision ID: james.westby@ubuntu.com-20090428125702-hvcsq02o58kxa9cu
Tags: 2.26.0-1
http://bugs.debian.org/519263
[ Josselin Mouette ]
* Add libglib2.0-doc to b-d-i to ensure proper xrefs.
* Move gvfs from recommends to depends. Closes: #519263.
* Stop mentioning GNOME 2.

[ Luca Bruno ]
* New upstream release.
* debian/control.in:
  - Bump intltool Build-Depend to 0.40.0.
  - Update to Standards-Version 3.8.1, no additional changes needed.
  - Fix debug package section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome/dllmain.c
111
111
        *full_prefix = NULL;
112
112
        *cp_prefix = NULL;
113
113
 
114
 
        if (G_WIN32_HAVE_WIDECHAR_API ()) {
115
 
                /* NT-based Windows has wide char API */
116
 
                if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
117
 
                        *full_prefix = g_utf16_to_utf8 (wcbfr, -1,
118
 
                                                        NULL, NULL, NULL);
119
 
                        if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
120
 
                            /* Short pathnames always contain only
121
 
                             * ASCII, I think, but just in case, be
122
 
                             * prepared.
123
 
                             */
124
 
                            WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
125
 
                                                 cpbfr, G_N_ELEMENTS (cpbfr),
126
 
                                                 NULL, NULL))
127
 
                                *cp_prefix = g_strdup (cpbfr);
128
 
                        else if (*full_prefix)
129
 
                                *cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
130
 
                                                                 NULL, NULL, NULL);
131
 
                }
132
 
        } else {
133
 
                /* Win9x */
134
 
                if (GetModuleFileNameA ((HMODULE) hmodule, cpbfr, G_N_ELEMENTS (cpbfr))) {
135
 
                        *full_prefix = g_locale_to_utf8 (cpbfr, -1,
 
114
        if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
 
115
                *full_prefix = g_utf16_to_utf8 (wcbfr, -1,
 
116
                                                NULL, NULL, NULL);
 
117
                if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
 
118
                    /* Short pathnames always contain only
 
119
                     * ASCII, I think, but just in case, be
 
120
                     * prepared.
 
121
                     */
 
122
                    WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
 
123
                                         cpbfr, G_N_ELEMENTS (cpbfr),
 
124
                                         NULL, NULL))
 
125
                        *cp_prefix = g_strdup (cpbfr);
 
126
                else if (*full_prefix)
 
127
                        *cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
136
128
                                                         NULL, NULL, NULL);
137
 
                        *cp_prefix = g_strdup (cpbfr);
138
 
                }
139
129
        }
140
130
 
141
131
        if (*full_prefix != NULL) {