Changeset 1383 for trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c

Timestamp:

03/16/07 07:39:08 (6 years ago)

Author:

zhiyong_sun

Message:

bug fixed: list_view.c::moko_add_window:pixbuf pointer free error

File:

• trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c (modified) (6 diffs)

trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c

@@ -161 +161 @@
 /* Destruction */
 void 
-moko_task_list_clear(MokoTaskList *l) { 
+moko_task_list_clear(MokoTaskList *l) 
+{ 
     if (!l) g_free (l);
 }
@@ -174 +175 @@
     name = moko_get_window_name(dpy, w);
     if (!strcmp (name, "Openmoko-taskmanager"))
-        {
+    {
         g_free (name);
         return;
-        }
+    }
 
     icon = moko_get_window_icon (dpy, w);
@@ -183 +184 @@
     gtk_list_store_set (list_store, &iter, TEXT_COL, name, OBJECT_COL, w, -1);
 
-    if (icon) {
+    if (icon) 
+        {
         GdkPixbuf *icons = gdk_pixbuf_scale_simple (icon, 160, 160, GDK_INTERP_BILINEAR);
         gtk_list_store_set (list_store, &iter, PIXBUF_COL, icons, -1);
-        gdk_pixbuf_unref (icons);
-        }
+            gdk_pixbuf_unref (icons);
+    }
     else if (default_icon) 
         gtk_list_store_set (list_store, &iter, PIXBUF_COL, default_icon, -1);
@@ -193 +195 @@
             g_error ("Failed to load %s's icon", name);
 
-    gdk_pixbuf_unref (icon);
+    if (icon)
+            gdk_pixbuf_unref (icon);
     g_free (name);
-   }
+}
 
 void 
@@ -215 +218 @@
         Window w;
         gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, OBJECT_COL, &w, -1);
-        for (i=0; i<nr; i++) {
-            if (list[i] == w) {
+        for (i=0; i<nr; i++) 
+                {
+            if (list[i] == w) 
+                        {
                 p[i] = 1;
                 found = TRUE;
                 break;
-                }
             }
+        }
         if (found)
             more = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter);
@@ -230 +235 @@
     }
     
-    for (i=0; i<nr; i++) {
+    for (i=0; i<nr; i++) 
+        {
         if (p[i] == 0 && list[i] != my_win)
             moko_add_window (dpy, list[i], list_store);
-        }
+        }
 
         g_free (p);