X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=gio%2Fgwin32appinfo.c;h=7762a2b26ea5f61dec5d4a08a74d2ae3a0ac7d33;hb=cea9de93c8838099661f5b54462f9c4b6410bfc9;hp=d9ec4048f49402375053d4417f15825d97fcf5c1;hpb=8af463f939730be9236460977878912b856dbb9d;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c
index d9ec404..7762a2b 100644
--- a/gio/gwin32appinfo.c
+++ b/gio/gwin32appinfo.c
@@ -13,19 +13,18 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
-#include
+#include "config.h"
#include
-#include "gcontenttypeprivate.h"
+#include "gcontenttype.h"
#include "gwin32appinfo.h"
+#include "gappinfo.h"
#include "gioerror.h"
#include "gfile.h"
#include
@@ -34,7 +33,6 @@
#include
#include
-#include "gioalias.h"
#ifndef ASSOCF_INIT_BYEXENAME
#define ASSOCF_INIT_BYEXENAME 0x00000002
@@ -79,9 +77,8 @@ g_win32_app_info_finalize (GObject *object)
g_free (info->id_utf8);
g_free (info->name);
g_free (info->executable);
-
- if (G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize) (object);
+
+ G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize (object);
}
static void
@@ -239,7 +236,7 @@ g_win32_app_info_get_executable (GAppInfo *appinfo)
return info->executable;
}
-static const char *
+static GIcon *
g_win32_app_info_get_icon (GAppInfo *appinfo)
{
/* GWin32AppInfo *info = G_WIN32_APP_INFO (appinfo); */
@@ -274,11 +271,20 @@ g_win32_app_info_launch (GAppInfo *appinfo,
NULL,
&class_key) != S_OK)
{
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Can't find application"));
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Can't find application"));
return FALSE;
}
#endif
+ /* FIXME: Need to do something with
+ * g_app_launch_context_get_environment()... ShellExecuteExW()
+ * doesn't have any way to pass an environment though. We need to
+ * either (a) update environment, ShellExecuteExW(), revert
+ * environment; or (b) find an API to figure out what app
+ * ShellExecuteExW() would launch, and then use g_spawn_async()
+ * instead.
+ */
+
for (l = files; l != NULL; l = l->next)
{
char *path = g_file_get_path (l->data);
@@ -293,25 +299,12 @@ g_win32_app_info_launch (GAppInfo *appinfo,
exec_info.nShow = SW_SHOWNORMAL;
exec_info.hkeyClass = class_key;
- if (!ShellExecuteExW(&exec_info))
+ if (!ShellExecuteExW (&exec_info))
{
- DWORD last_error;
- LPVOID message;
- char *message_utf8;
-
- last_error = GetLastError ();
- FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- last_error,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &message,
- 0, NULL );
-
- message_utf8 = g_utf16_to_utf8 (message, -1, NULL, NULL, NULL);
+ char *message_utf8 = g_win32_error_message (GetLastError ());
+
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Error launching application: %s"), message_utf8);
g_free (message_utf8);
- LocalFree (message);
g_free (wfilename);
RegCloseKey (class_key);
@@ -344,9 +337,9 @@ g_win32_app_info_launch_uris (GAppInfo *appinfo,
GAppLaunchContext *launch_context,
GError **error)
{
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("URIs not supported"));
+ g_set_error_literal (error, G_IO_ERROR,
+ G_IO_ERROR_NOT_SUPPORTED,
+ _("URIs not supported"));
return FALSE;
}
@@ -366,9 +359,9 @@ g_win32_app_info_set_as_default_for_type (GAppInfo *appinfo,
const char *content_type,
GError **error)
{
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("association changes not supported on win32"));
+ g_set_error_literal (error, G_IO_ERROR,
+ G_IO_ERROR_NOT_SUPPORTED,
+ _("association changes not supported on win32"));
return FALSE;
}
@@ -378,9 +371,9 @@ g_app_info_create_from_commandline (const char *commandline,
GAppInfoCreateFlags flags,
GError **error)
{
- g_set_error (error, G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("Association creation not supported on win32"));
+ g_set_error_literal (error, G_IO_ERROR,
+ G_IO_ERROR_NOT_SUPPORTED,
+ _("Association creation not supported on win32"));
return NULL;
}
@@ -601,6 +594,28 @@ g_app_info_get_all_for_type (const char *content_type)
return g_list_reverse (infos);
}
+GList *
+g_app_info_get_recommended_for_type (const char *content_type)
+{
+ /* FIXME: this should generate a list of applications that are registered
+ * as direct handlers for the given content type, without using MIME subclassing.
+ * See g_app_info_get_recommended_for_type() in gdesktopappinfo.c for a reference
+ * UNIX implementation.
+ */
+ return g_app_info_get_all_for_type (content_type);
+}
+
+GList *
+g_app_info_get_fallback_for_type (const char *content_type)
+{
+ /* FIXME: this should generate a list of applications that are registered
+ * as handlers for a superclass of the given content type, but are not
+ * direct handlers for the content type itself. See g_app_info_get_fallback_for_type()
+ * in gdesktopappinfo.c for a reference UNIX implementation.
+ */
+ return g_app_info_get_all_for_type (content_type);
+}
+
GAppInfo *
g_app_info_get_default_for_type (const char *content_type,
gboolean must_support_uris)
@@ -674,3 +689,9 @@ g_app_info_get_all (void)
return g_list_reverse (infos);
}
+
+void
+g_app_info_reset_type_associations (const char *content_type)
+{
+ /* nothing to do */
+}