Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c e_border.h 


Log Message:
New netwm icon api.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -3 -r1.413 -r1.414
--- e_border.c  24 Sep 2005 11:45:09 -0000      1.413
+++ e_border.c  25 Sep 2005 16:43:34 -0000      1.414
@@ -2097,12 +2097,13 @@
               edje_object_file_set(o, a->path, "icon");
          }
      }
-   else if (bd->client.netwm.icon.data)
+   else if (bd->client.netwm.icons)
      {
+       /* TODO: Use the right icon */
        o = e_icon_add(evas);
-       e_icon_data_set(o, bd->client.netwm.icon.data,
-                       bd->client.netwm.icon.width,
-                       bd->client.netwm.icon.height);
+       e_icon_data_set(o, bd->client.netwm.icons[0].data,
+                       bd->client.netwm.icons[0].width,
+                       bd->client.netwm.icons[0].height);
        e_icon_alpha_set(o, 1);
      }
    return o;
@@ -4200,10 +4201,9 @@
      }
    if (bd->client.netwm.fetch.icon)
      {
-       if (bd->client.netwm.icon.data) free(bd->client.netwm.icon.data);
-       if (!ecore_x_netwm_icon_get(bd->client.win,
-                                   &bd->client.netwm.icon.width, 
&bd->client.netwm.icon.height,
-                                   &bd->client.netwm.icon.data, 
&bd->client.netwm.icon.size))
+       E_FREE(bd->client.netwm.icons);
+       if (!ecore_x_netwm_icons_get(bd->client.win,
+                                    &bd->client.netwm.icons, 
&bd->client.netwm.num_icons))
          printf("ERROR: Fetch icon from client\n");
        else
          bd->changes.icon = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_border.h  23 Sep 2005 15:47:18 -0000      1.115
+++ e_border.h  25 Sep 2005 16:43:34 -0000      1.116
@@ -196,12 +196,8 @@
         unsigned int desktop;
         char *name;
         char *icon_name;
-        struct {
-             unsigned int *data;
-             int width;
-             int height;
-             int size;
-        } icon;
+        Ecore_X_Icon *icons;
+        int num_icons;
         unsigned int user_time;
         struct {
              int left;




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to