From: Jisung Ahn Date: Fri, 21 Dec 2012 12:15:50 +0000 (+0900) Subject: change com.samsung to org.tizen X-Git-Tag: 2.1b_release~3^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7477c128fd9c710e99457431a22895470b74049;p=apps%2Fhome%2Fug-image-viewer-efl.git change com.samsung to org.tizen Change-Id: I1e978b738f7f96ce85b54fceb20c2478afcd8230 --- diff --git a/feature/include/ivug-ext-ug.h b/feature/include/ivug-ext-ug.h index 2e26b66..a449c52 100755 --- a/feature/include/ivug-ext-ug.h +++ b/feature/include/ivug-ext-ug.h @@ -50,9 +50,6 @@ bool ivug_ext_launch_email(const char *uri); /* Below functions are not used at Now, but should be needed soon. */ -bool ivug_ext_launch_picasa(const char *uri); -bool ivug_ext_launch_facebook(const char *uri); -bool ivug_ext_launch_twitter(const char *uri); bool ivug_ext_launch_print(const char *uri); bool ivug_ext_launch_default(const char *uri, const char *operation, const char *pkg, void *data); diff --git a/feature/src/ivug-ext-ug.c b/feature/src/ivug-ext-ug.c index bdfbbca..7e418ad 100755 --- a/feature/src/ivug-ext-ug.c +++ b/feature/src/ivug-ext-ug.c @@ -34,18 +34,15 @@ #define CONTACT_SELECT_UG_NAME "contacts-tabui-efl" -#define VIDEOPLAYER_PKG_NAME "com.samsung.video-player" -#define BLUETOOTH_PKG_NAME "com.samsung.bluetooth" -#define BROWSER_PKG_NAME "com.samsung.browser" -#define MESSAGE_PKG_NAME "com.samsung.message" -#define EMAIL_PKG_NAME "com.samsung.email" - - -#define FACEBOOK_PKG_NAME "com.samsung.facebook" +#define VIDEOPLAYER_PKG_NAME "org.tizen.video-player" +#define BLUETOOTH_PKG_NAME "org.tizen.bluetooth" +#define BROWSER_PKG_NAME "org.tizen.browser" +#define MESSAGE_PKG_NAME "org.tizen.message" +#define EMAIL_PKG_NAME "org.tizen.email" #define WIFI_FILE_TRANSFER_UG_NAME "fileshare-efl" -#define PRINT_PKG_NAME "com.samsung.mobileprint" +#define PRINT_PKG_NAME "org.tizen.mobileprint" #define OPERATION_NAME_PRINT "http://tizen.org/appcontrol/operation/PRINT" @@ -823,220 +820,6 @@ VIDEO_PLAYER_SIMPLE_END: return (ret == SERVICE_ERROR_NONE ? true : false); } -bool ivug_ext_launch_twitter(const char *uri) -{ - MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - if ( ivug_is_web_uri(uri) == true) - { - ret = service_set_operation(handle, SERVICE_OPERATION_SEND_TEXT); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto TWITTER_END; - } - ret = service_add_extra_data(handle, SERVICE_DATA_TEXT, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto TWITTER_END; - } - } - else - { - ret = service_set_operation(handle, SERVICE_OPERATION_SEND); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto TWITTER_END; - } - ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto TWITTER_END; - } - } - - const char *pkgname = "com.samsung.twitter"; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto TWITTER_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto TWITTER_END; - } - -TWITTER_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - -bool ivug_ext_launch_facebook(const char *uri) -{ - MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - if ( ivug_is_web_uri(uri) == true) - { - ret = service_set_operation(handle, SERVICE_OPERATION_SEND_TEXT); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto FACEBOOK_END; - } - ret = service_add_extra_data(handle, SERVICE_DATA_TEXT, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto FACEBOOK_END; - } - } - else - { - ret = service_set_operation(handle, SERVICE_OPERATION_SEND); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto FACEBOOK_END; - } - ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto FACEBOOK_END; - } - } - - const char *pkgname = "com.samsung.facebook"; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto FACEBOOK_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto FACEBOOK_END; - } - -FACEBOOK_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - -bool ivug_ext_launch_picasa(const char *uri) -{ - MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); - - int ret = -1; - int destroy_ret = -1; - char xwin_id_str[12] = {0,}; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_set_operation(handle, SERVICE_OPERATION_SEND); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto PICASA_END; - } - ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto PICASA_END; - } - - const char *pkgname = "com.samsung.picasa"; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto PICASA_END; - } - - Ecore_X_Window xwin_id = elm_win_xwindow_get(ug_get_window()); - eina_convert_itoa(xwin_id, xwin_id_str); - ret = service_add_extra_data(handle, "XWINDOW_ID", xwin_id_str); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto PICASA_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto PICASA_END; - } - -PICASA_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - bool ivug_ext_launch_browser(const char *uri) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); diff --git a/main/src/ug-image-viewer.cpp b/main/src/ug-image-viewer.cpp index a0b515b..f2bd46c 100755 --- a/main/src/ug-image-viewer.cpp +++ b/main/src/ug-image-viewer.cpp @@ -38,7 +38,7 @@ #include "ivug-parameter.h" -#define SHORTCUT_ICON_PATH "/usr/share/icons/default/small/com.samsung.image-viewer.png" +#define SHORTCUT_ICON_PATH "/usr/share/icons/default/small/org.tizen.image-viewer.png" typedef struct ug_data { Evas_Object *base; // UG layout diff --git a/main/src/view/ivug-main-view-menu.cpp b/main/src/view/ivug-main-view-menu.cpp index 1308f5f..c445de4 100755 --- a/main/src/view/ivug-main-view-menu.cpp +++ b/main/src/view/ivug-main-view-menu.cpp @@ -45,10 +45,10 @@ #define IVUG_DEFINE_EXIF_ROTATE -#define GALLERY_PKG_NAME "com.samsung.gallery" +#define GALLERY_PKG_NAME "org.tizen.gallery" #define SHORTCUT_PREFIX "gallery:imageviewer:" #define SHORTCUT_PREFIX_LEN strlen(SHORTCUT_PREFIX) -#define SHORTCUT_ICON_PATH "/usr/share/icons/default/small/com.samsung.image-viewer.png" +#define SHORTCUT_ICON_PATH "/usr/share/icons/default/small/org.tizen.image-viewer.png" static void _on_ext_ug_destroy_cb(ui_gadget_h ug, void *priv)