From: Chris Michael <cp.michael@samsung.com>
Date: Thu, 25 Jun 2015 17:33:57 +0000 (-0400)
Subject: elementary: Add rudimentary support for Elm Wayland apps to set border icon
X-Git-Tag: v1.15.0-alpha1~128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30b6179eb915595180fa30decc87434aa0c7e290;p=platform%2Fupstream%2Felementary.git

elementary: Add rudimentary support for Elm Wayland apps to set border icon

Summary: This is a patch to fix T2453 where elm apps in weston/E did
not display the icon on the border. This is just preliminary support
because it only tries to find the efreet desktop file based on
_elm_appname. This support Could be extended to allow efreet to search
based on window title, etc, etc.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
---

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 6d41359..cb909a0 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2836,6 +2836,23 @@ _elm_win_frame_add(Elm_Win_Data *sd,
 
    evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE);
 
+   if (!sd->icon)
+     {
+        Efreet_Desktop *d;
+
+        sd->icon = elm_icon_add(sd->obj);
+
+        d = efreet_util_desktop_exec_find(_elm_appname);
+        if (d)
+          {
+             elm_icon_standard_set(sd->icon, d->icon);
+             efreet_desktop_free(d);
+          }
+     }
+
+   edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon",
+                            sd->icon);
+
    evas_object_event_callback_add
      (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd);
    evas_object_event_callback_add