Fixed Prevent Issues

diff --git a/debian/changelog b/debian/changelog
index 40846e246ff6094b9dbc47e2fdee7f2789d8c8a1..5833e00e82fb686a4a8336b652694c9ac245b2a7 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ise-default (0.3.022-1) unstable; urgency=low
+
+  * Fixed Prevent Issues
+  * Git: slp/pkgs/i/ise-default
+  * Tag: ise-default_0.3.022-1
+
+ -- Ankush Dua <ankush.d@samsung.com>  Mon, 03 Sep 2012 16:05:30 +0530
+
 ise-default (0.3.021-1) unstable; urgency=low
 
   * Applied profiles to MCF windows

diff --git a/mcf/gwes/efl/mcfgraphics-efl.cpp b/mcf/gwes/efl/mcfgraphics-efl.cpp
index dc4a146f2583a74d5365fa70c82ad1943d2d47fc..fdc40e92cf32538b98c0ecd9dfd22b4ae1f777ef 100755 (executable)
--- a/mcf/gwes/efl/mcfgraphics-efl.cpp
+++ b/mcf/gwes/efl/mcfgraphics-efl.cpp
@@ -215,11 +215,7 @@ CMCFGraphicsImplEfl::draw_image(mcfwindow window, const mcfdrawctx drawCtx, mcfc
 #else
                         evas_object_move(imgobj, destX - srcX, destY - srcY);
                         evas_object_image_fill_set(imgobj, 0, 0, imgWidth, imgHeight);
-                        if(extractImg) {
-                            evas_object_resize(imgobj, imgWidth, imgHeight);
-                        } else {
-                            evas_object_resize(imgobj, destWidth, destHeight);
-                        }
+                        evas_object_resize(imgobj, imgWidth, imgHeight);
 
                         Evas_Object *clipper = evas_object_rectangle_add(evas);
                         evas_object_color_set(clipper, 255, 255, 255, 255);

diff --git a/mcf/include/mcfcore.h b/mcf/include/mcfcore.h
index 591b260b4c7a8095fe010a394ed146a6ad9926f7..cb35b19103dcef8452551fce1599cea81d26442d 100755 (executable)
--- a/mcf/include/mcfcore.h
+++ b/mcf/include/mcfcore.h
@@ -44,7 +44,7 @@ public:
 private:
 
 public:
-    mcfboolean run();
+    void run();
     void show();
     void hide();
 

diff --git a/mcf/mcfcontext.cpp b/mcf/mcfcontext.cpp
index 90cd08cea39167f8ab4d6cb93d01e44d0d39bb84..8cc9e59f7ddfa326434b149c86cff29313d74965 100755 (executable)
--- a/mcf/mcfcontext.cpp
+++ b/mcf/mcfcontext.cpp
@@ -533,8 +533,6 @@ CMCFContext::get_multi_touch_event_order(mcftouchdevice touchid)
     mcfint ret = -1;
     mcfint iSeqIndex = 0;
 
-    CMCFResourceCache *cache = CMCFResourceCache::get_instance();
-
     for(std::list<mcftouchdevice>::iterator list_iter = mMultiTouchSeq.begin();
         (ret == -1) && list_iter != mMultiTouchSeq.end();std::advance(list_iter, 1)) {
             if(touchid == (*list_iter)) {

diff --git a/mcf/mcfcore.cpp b/mcf/mcfcore.cpp
index 909fc92faa5ddef14f5cfd325d1c4a59a28d937c..3528375cc03b3555cbb94ccf7e096b1ef09754a4 100755 (executable)
--- a/mcf/mcfcore.cpp
+++ b/mcf/mcfcore.cpp
@@ -57,7 +57,7 @@ CMCFCore::~CMCFCore()
  * Shows the MCF main window
  * For displaying the MCF UI, you should explicitly call this function after CMCFCore class is created
  */
-mcfboolean
+void
 CMCFCore::run()
 {
     MCF_DEBUG();

diff --git a/mcf/mcffeedback.cpp b/mcf/mcffeedback.cpp
index 94c832c14483fb6b04e6586f0cb4fec40bfc4a59..43eac549c68572305f8022dad32a070f641a408c 100755 (executable)
--- a/mcf/mcffeedback.cpp
+++ b/mcf/mcffeedback.cpp
@@ -49,12 +49,6 @@ mcfboolean
 CMCFFeedback::button_pressed(mcfwindow window, mcfbyte keyindex)
 {
     MCF_DEBUG();
-    CMCFResourceCache *cache = CMCFResourceCache::get_instance();
-    if(cache) {
-        const McfLayoutKeyConfigure *configure = cache->get_cur_layout_key_configure(window, keyindex);
-        CMCFUtils *utils = CMCFUtils::get_instance();
-        CMCFContext *context = CMCFContext::get_instance();
-    }
     return TRUE;
 }
 

diff --git a/mcf/mcfresourcecache.cpp b/mcf/mcfresourcecache.cpp
index 2fcf43a46714825e9527a930affd9783c5dee3f3..77de4ea0db17e293bcf4b0955067ad008febd02c 100755 (executable)
--- a/mcf/mcfresourcecache.cpp
+++ b/mcf/mcfresourcecache.cpp
@@ -361,6 +361,8 @@ CMCFResourceCache::resize_resource_elements_by_resolution()
             }
         }
     }
+
+    return TRUE;
 }
 
 /**
@@ -507,7 +509,7 @@ CMCFResourceCache::add_private_key(McfPrivateKeyProperties* privProperties, mcfb
         return -1;
 
     /* Finds an index to be set */
-    mcfint loop = 0;
+    mcfuint loop = 0;
     for (loop = 0;loop < MAX_PRIVATE_KEY; loop++) {
         if ((mPrivateKeyProperties[loop].inputModeIdx == privProperties->inputModeIdx) &&
             (mPrivateKeyProperties[loop].layoutIdx == privProperties->layoutIdx) &&
@@ -563,8 +565,6 @@ CMCFResourceCache::remove_private_key(mcfint id)
 {
     MCF_DEBUG();
     mcfint loop;
-    CMCFContext *context = CMCFContext::get_instance();
-
 
     /* resets the current properties to predefined properties */
     mcfbyte keyidx = mPrivateKeyProperties[id].keyIdx;
@@ -578,7 +578,7 @@ CMCFResourceCache::remove_private_key(mcfint id)
 
     /* Shift all the privatekey properties to the left by 1, starting from the item next to the id th element */
     for (loop = id;loop < MAX_PRIVATE_KEY - 1; loop++) {
-        memcpy(&mPrivateKeyProperties[loop], &mPrivateKeyProperties[loop + 1], sizeof(&mPrivateKeyProperties[loop]));
+        memcpy(&mPrivateKeyProperties[loop], &mPrivateKeyProperties[loop + 1], sizeof(McfPrivateKeyProperties));
     }
     /* Fill 0x00 to the last element */
     memset(&mPrivateKeyProperties[MAX_PRIVATE_KEY - 1], 0x00, sizeof(McfPrivateKeyProperties));
@@ -610,9 +610,7 @@ CMCFResourceCache::recompute_layout(mcfwindow window)
 
     CMCFWindows *windows = CMCFWindows::get_instance();
     CMCFContext *context = CMCFContext::get_instance();
-    mcfbyte display = context->get_display();
-    mcfbyte inputmode = context->get_input_mode();
-    mcfint sublayoutidx = context->get_cur_sublayout_id();
+    mcfbyte inputmode = MAX_INPUT_MODE;
 
     McfKeyset keyset = MAX_KEYSET;
     mcf8 popupindex = NOT_USED;
@@ -625,6 +623,7 @@ CMCFResourceCache::recompute_layout(mcfwindow window)
 
     mcfshort layout =  NOT_USED;
     if(windows && context) {
+        inputmode = context->get_input_mode();
         if (windows->is_base_window(window)) {
             layout = mcf_input_mode_configure[inputmode].layoutId[context->get_display()];
 
@@ -1114,6 +1113,7 @@ CMCFResourceCache::set_cur_themename( const mcfchar *themename )
                 }
                 index++;
             }
+            fclose(fp);
         }
     }
 

diff --git a/mcf/mcfuibuilder.cpp b/mcf/mcfuibuilder.cpp
index febf7f39fa2e934af223903972792d9af152a2a2..bb5ede2697110963871d7da262c4ad8ffb7b5059 100755 (executable)
--- a/mcf/mcfuibuilder.cpp
+++ b/mcf/mcfuibuilder.cpp
@@ -93,15 +93,6 @@ CMCFUIBuilder::init(mcfwindow parentWnd)
     if(mcf_check_arrindex(defaultLayoutIdx, MAX_LAYOUT)) {
         mGwes->mWnd->create_dim_window(window, NULL, mcf_layout[defaultLayoutIdx].width, mcf_layout[defaultLayoutIdx].height);
     }
-
-    /* For testing pre-image load */
-    CMCFImageProxy *proxy = CMCFImageProxy::get_instance();
-    mcfchar retPath[_POSIX_PATH_MAX] = {0,};
-    for (mcfint loop = 0; loop < MAX_PRELOAD_IMG_CNT; loop++) {
-        memset(retPath, 0x00, sizeof(mcfchar)*_POSIX_PATH_MAX);
-        mUtils->get_composed_path(retPath, sizeof(retPath), mcf_preload_image[loop]);
-        proxy->get_image(retPath);
-    }
 }
 
 /**
@@ -162,12 +153,14 @@ CMCFUIBuilder::show_layout(const mcfwindow window, const mcf16 x, const mcf16 y,
                     mcfint targety = layout->y;
                     mcfwindow targetwin = window;
                     McfWindowContext *winctx = windows->get_window_context(window, FALSE);
-                    if(winctx->isVirtual) {
-                        McfWindowContext *basectx = windows->get_window_context(windows->get_base_window(), FALSE);
-                        if(basectx) {
-                            targetwin = windows->get_base_window();
-                            targetx += winctx->x - basectx->x;
-                            targety += winctx->y - basectx->y;
+                    if (winctx) {
+                        if(winctx->isVirtual) {
+                            McfWindowContext *basectx = windows->get_window_context(windows->get_base_window(), FALSE);
+                            if(basectx) {
+                                targetwin = windows->get_base_window();
+                                targetx += winctx->x - basectx->x;
+                                targety += winctx->y - basectx->y;
+                            }
                         }
                     }
                     if (strlen(layout->imgPath[BUTTON_STATE_NORMAL]) > 0) {
@@ -339,7 +332,7 @@ CMCFUIBuilder::draw_button_label(const mcfwindow window, const mcfdrawctx drawCt
     mcfint targetaddy = 0;
     mcfwindow targetwin = window;
     McfWindowContext *winctx = windows->get_window_context(window, FALSE);
-
+    if (winctx) {
         if(winctx->isVirtual) {
             McfWindowContext *basectx = windows->get_window_context(windows->get_base_window(), FALSE);
             if(basectx) {
@@ -348,6 +341,7 @@ CMCFUIBuilder::draw_button_label(const mcfwindow window, const mcfdrawctx drawCt
                 targetaddy = winctx->y - basectx->y;
             }
         }
+    }
 
         /* for image label  */
         if (properties->labelImgPath[fShift][state]) {
@@ -494,8 +488,10 @@ CMCFUIBuilder::draw_window_bg_by_sw(const mcfwindow window, const mcfdrawctx dra
         /* If the target window is virtual window, let's draw it on the base window */
         mcfwindow targetwin = window;
         McfWindowContext *winctx = windows->get_window_context(window, FALSE);
-        if(winctx->isVirtual) {
-            targetwin = windows->get_base_window();
+        if (winctx) {
+            if(winctx->isVirtual) {
+                targetwin = windows->get_base_window();
+            }
         }
 
         graphics->draw_rectangle(targetwin, drawCtx, 0, 0, size.width, size.height, lineWidth, lineColor, TRUE, fillColor);
@@ -605,12 +601,14 @@ CMCFUIBuilder::draw_button_bg_by_img(const mcfwindow window, const mcfdrawctx dr
         mcfint targety = coordination->y;
         mcfwindow targetwin = window;
         McfWindowContext *winctx = windows->get_window_context(window, FALSE);
-        if(winctx->isVirtual) {
-            McfWindowContext *basectx = windows->get_window_context(windows->get_base_window(), FALSE);
-            if(basectx) {
-                targetwin = windows->get_base_window();
-                targetx += winctx->x - basectx->x;
-                targety += winctx->y - basectx->y;
+        if(winctx) {
+            if(winctx->isVirtual) {
+                McfWindowContext *basectx = windows->get_window_context(windows->get_base_window(), FALSE);
+                if(basectx) {
+                    targetwin = windows->get_base_window();
+                    targetx += winctx->x - basectx->x;
+                    targety += winctx->y - basectx->y;
+                }
             }
         }
 

diff --git a/mcf/mcfwindows.cpp b/mcf/mcfwindows.cpp
index c377f9a0f9ac2e4adf31475a96c3cd716658f042..b1d031682df1df87208d5d2832ddfbf60605865d 100755 (executable)
--- a/mcf/mcfwindows.cpp
+++ b/mcf/mcfwindows.cpp
@@ -175,7 +175,6 @@ mcfwindow CMCFWindows::open_popup(const mcfwindow parentWnd, const mcfint parent
                 mcfbyte pressedKey = context->get_cur_pressed_key(context->get_last_touch_device_id());
 
                 const McfLayoutKeyCoordination* coordination = cache->get_cur_layout_key_coordination(pressedWin, pressedKey);
-                McfButtonContext *btncontext = cache->get_cur_button_context(pressedWin, pressedKey);
 
                 mcfwindow move_window = context->get_cur_move_window(context->get_last_touch_device_id());
                 McfPoint move_point = context->get_cur_move_point(context->get_last_touch_device_id());
@@ -236,10 +235,6 @@ mcfwindow CMCFWindows::open_context_popup(const mcfwindow parentWnd)
     CMCFEvents *events = CMCFEvents::get_instance();
     CMCFActionState *state = CMCFActionState::get_instance();
     CMCFController *controller = CMCFController::get_instance();
-    CMCFResourceCache *cache = CMCFResourceCache::get_instance();
-    CMCFContext *context = CMCFContext::get_instance();
-    CMCFWindows *windows = CMCFWindows::get_instance();
-    CMCFUtils *utils = CMCFUtils::get_instance();
     CMCFWindowsImpl* impl = get_mcf_windows_impl();
     ctx_window = impl->create_context_popup_window(parentWnd);
     events->connect_window_events(ctx_window, MCF_EVENT_MOUSE | MCF_EVENT_EXPOSE);

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index 0e215fdf5add2bdc6b80975f9e83763f122e548c..89e9ba136c464ac356e78e545a3f01083750703b 100755 (executable)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -1,6 +1,6 @@
 Name:       ise-default
 Summary:    Tizen keyboard
-Version:    0.3.021
+Version:    0.3.022
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License

diff --git a/res/mcfresource.h b/res/mcfresource.h
index 2de6fcbf879a749f1a76ae9ec08b6c49e3b1020b..1f4b953fc20154f9d78843d9e412a8b5fc5ce5ce 100755 (executable)
--- a/res/mcfresource.h
+++ b/res/mcfresource.h
@@ -921,10 +921,6 @@ static McfLabelProperties AUTOPOPUP_LABEL_PROP = {
 extern McfAutoPopupConfigure mcf_autopopup_configure;
 extern McfDimWndConfigure mcf_dim_window_configure;
 
-#define MAX_PRELOAD_IMG_CNT 0
-static const mcfchar* mcf_preload_image[MAX_PRELOAD_IMG_CNT] = {
-};
-
 static const McfNinePatchInfo mcf_nine_patch_info[] = {
        {"textinput_moa_button1_nml.png", 3, 3, 3, 3},
        {"textinput_moa_button1_function.png", 3, 3, 3, 3},