projects
/
platform
/
core
/
appfw
/
appcore-widget.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix errata in doxygen comment
[platform/core/appfw/appcore-widget.git]
/
src
/
widget_app.c
diff --git
a/src/widget_app.c
b/src/widget_app.c
index
4ee4e2e
..
b3c18c5
100755
(executable)
--- a/
src/widget_app.c
+++ b/
src/widget_app.c
@@
-36,7
+36,7
@@
#include <system_info.h>
#include <vconf.h>
#include <vconf-internal-keys.h>
#include <system_info.h>
#include <vconf.h>
#include <vconf-internal-keys.h>
-#include <
aul_rsm
_provider.h>
+#include <
screen_connector
_provider.h>
#include "widget_app.h"
#include "widget-log.h"
#include "widget_app.h"
#include "widget-log.h"
@@
-891,8
+891,7
@@
static int __before_loop(int argc, char **argv)
_E("failed to get launch argv"); /* LCOV_EXCL_LINE */
}
_E("failed to get launch argv"); /* LCOV_EXCL_LINE */
}
- aul_rsm_provider_init();
-
+ screen_connector_provider_init();
elm_init(argc, argv);
r = aul_launch_init(__aul_handler, NULL);
elm_init(argc, argv);
r = aul_launch_init(__aul_handler, NULL);
@@
-963,7
+962,7
@@
static void __after_loop()
if (app_ops->terminate)
app_ops->terminate(app_user_data);
if (app_ops->terminate)
app_ops->terminate(app_user_data);
-
aul_rsm
_provider_fini();
+
screen_connector
_provider_fini();
_widget_app_free_viewer_endpoint();
_widget_core_unset_appcore_event_cb();
_widget_app_free_viewer_endpoint();
_widget_core_unset_appcore_event_cb();
@@
-974,6
+973,11
@@
static void __after_loop()
package_id = NULL;
}
package_id = NULL;
}
+ if (appid) {
+ free(appid);
+ appid = NULL;
+ }
+
elm_shutdown();
}
elm_shutdown();
}
@@
-1149,8
+1153,13
@@
EXPORT_API int widget_app_main(int argc, char **argv,
app_ops = callback;
app_user_data = user_data;
r = __before_loop(argc, argv);
app_ops = callback;
app_user_data = user_data;
r = __before_loop(argc, argv);
- if (r < 0)
+ if (r < 0) {
+ if (appid) {
+ free(appid);
+ appid = NULL;
+ }
return r;
return r;
+ }
ecore_main_loop_begin();
aul_status_update(STATUS_DYING);
ecore_main_loop_begin();
aul_status_update(STATUS_DYING);
@@
-1393,8
+1402,7
@@
EXPORT_API int widget_app_get_elm_win(widget_context_h context,
_E("failed to get surface"); /* LCOV_EXCL_LINE */
goto fault; /* LCOV_EXCL_LINE */
}
_E("failed to get surface"); /* LCOV_EXCL_LINE */
goto fault; /* LCOV_EXCL_LINE */
}
-
- aul_rsm_provider_remote_enable(cxt->id, surface);
+ screen_connector_provider_remote_enable(cxt->id, surface);
ecore_wl_window_class_name_set(wl_win, cxt->id);
elm_win_aux_hint_add(ret_win, "wm.policy.win.user.geometry", "1");
ecore_wl_window_class_name_set(wl_win, cxt->id);
elm_win_aux_hint_add(ret_win, "wm.policy.win.user.geometry", "1");
@@
-1540,6
+1548,7
@@
EXPORT_API int widget_app_context_set_content_info(widget_context_h context,
else
context->content = NULL;
else
context->content = NULL;
+ free(raw);
if (ret < 0) {
/* LCOV_EXCL_START */
_E("failed to send content info: %s of %s (%d)", context->id,
if (ret < 0) {
/* LCOV_EXCL_START */
_E("failed to send content info: %s of %s (%d)", context->id,