Enlightenment CVS committal

Author  : andreas99
Project : e16
Module  : tools

Dir     : e16/tools/e16menuedit2/src


Modified Files:
        callbacks.c file.c 


Log Message:
removed several bugs...
- svg/gdk bug workaround

===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- callbacks.c 27 Jul 2004 11:21:18 -0000      1.2
+++ callbacks.c 27 Jul 2004 13:27:16 -0000      1.3
@@ -167,14 +167,27 @@
         gint width, height;
         gint width_new, height_new;
         gchar filename_resized[PATH_MAX];
+        gchar *right;
 
         entry_select = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (
                                              resize_combo)->entry));
 
-        gdk_pixbuf_get_file_info (filename,
-                                  &width,
-                                  &height);
-
+       /* temporary fix for probability broken gdk function */
+        right = g_malloc (3);
+        strsplit (filename, &right, g_utf8_strlen (filename, -1) - 3);
+        if (strcmp (right, "svg"))
+        {
+          gdk_pixbuf_get_file_info (filename,
+                                    &width,
+                                    &height);
+        }
+        else
+        {
+          width = 64;
+          height = 64;
+        }
+       g_free (right);
+      
         if (width <= 0)
           width = 1;
         if (height <= 0)
@@ -398,10 +411,23 @@
 
   if (filename != NULL)
   {
-    gdk_pixbuf_get_file_info (filename,
-                              &width,
-                              &height);
+    gchar *right;
+
+    /* temporary fix for probability broken gdk function */
+    right = g_malloc (3);
+    strsplit (filename, &right, g_utf8_strlen (filename, -1) - 3);
 
+    if (strcmp (right, "svg"))
+    {
+      gdk_pixbuf_get_file_info (filename, &width, &height);
+    }
+    else
+    {
+      width = ICON_SIZE_AUTO;
+      height = ICON_SIZE_AUTO;
+    }
+    g_free (right);
+  
     if ((width > ICON_SIZE_AUTO) || (height > ICON_SIZE_AUTO))
     {
       width = ICON_SIZE_AUTO;
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- file.c      25 Jul 2004 17:21:51 -0000      1.1
+++ file.c      27 Jul 2004 13:27:16 -0000      1.2
@@ -160,7 +160,7 @@
   if (count < strlen (s))
   {
     if (right)
-       *right = s + count;
+       strcpy (*right, s + count);
 
     s_org[count]='\0';
   }




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to