r3397 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/common src/dialer

thomas at sita.openmoko.org thomas at sita.openmoko.org
Mon Nov 12 16:42:14 CET 2007


Author: thomas
Date: 2007-11-12 16:42:11 +0100 (Mon, 12 Nov 2007)
New Revision: 3397

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-tips.c
Log:
* src/common/moko-contacts.c: (moko_contacts_get_photo),
(moko_contacts_add_contact):
* src/common/moko-dialer-panel.c: (moko_dialer_panel_pressed):
* src/common/moko-dialer-textview.c:
(moko_dialer_textview_set_color):
* src/dialer/moko-keypad.c: (on_panel_user_input),
(on_panel_user_hold):
* src/dialer/moko-tips.c: (moko_tips_set_matches):

Plug lots of memory leaks


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-12 15:42:11 UTC (rev 3397)
@@ -1,5 +1,18 @@
 2007-11-12  Thomas Wood  <thomas at openedhand.com>
 
+	* src/common/moko-contacts.c: (moko_contacts_get_photo),
+	(moko_contacts_add_contact):
+	* src/common/moko-dialer-panel.c: (moko_dialer_panel_pressed):
+	* src/common/moko-dialer-textview.c:
+	(moko_dialer_textview_set_color):
+	* src/dialer/moko-keypad.c: (on_panel_user_input),
+	(on_panel_user_hold):
+	* src/dialer/moko-tips.c: (moko_tips_set_matches):
+
+	Plug lots of memory leaks
+
+2007-11-12  Thomas Wood  <thomas at openedhand.com>
+
 	* src/common/moko-dialer-textview.c: (moko_dialer_textview_init),
 	(moko_dialer_textview_set_color):
 	* src/common/moko-dialer-textview.h:

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c	2007-11-12 15:42:11 UTC (rev 3397)
@@ -162,7 +162,7 @@
   {
     g_warning ("%s\n", err->message);
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-	if (m_contact->photo)
+    if (m_contact->photo)
       g_object_ref (m_contact->photo); 
     return;
   }
@@ -171,7 +171,7 @@
   if (!photo)
   {
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-	if (m_contact->photo)
+    if (m_contact->photo)
       g_object_ref (m_contact->photo);
     return;
  
@@ -190,11 +190,12 @@
   else 
   {
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-	if (m_contact->photo)
-    	g_object_ref (m_contact->photo); 
-  }  
-  
+    if (m_contact->photo)
+      g_object_ref (m_contact->photo); 
+  }
+
   g_object_unref (loader);
+  e_contact_photo_free (photo);
 }
 
 MokoContactEntry*
@@ -281,8 +282,8 @@
     {
       for (numbers = e_vcard_attribute_get_values (attributes->data); numbers; numbers = numbers->next)
       {
-        phone = g_strdup (numbers->data);
-	 if (phone)
+        phone = numbers->data;
+        if (phone)
         {
           entry = g_new0 (MokoContactEntry, 1);
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c	2007-11-12 15:42:11 UTC (rev 3397)
@@ -185,7 +185,10 @@
     timeout_data->panel = panel;
     timeout_data->value = value;
 
-    hold_timeout_source = g_timeout_add_full (G_PRIORITY_DEFAULT, 800, (GSourceFunc) moko_dialer_panel_hold_timeout, timeout_data, (GDestroyNotify) g_free);
+    hold_timeout_source = g_timeout_add_full (G_PRIORITY_DEFAULT, 800,
+                                  (GSourceFunc) moko_dialer_panel_hold_timeout,
+                                  timeout_data,
+                                  (GDestroyNotify) g_free);
 
   }
   else if (event->type == GDK_BUTTON_RELEASE)

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c	2007-11-12 15:42:11 UTC (rev 3397)
@@ -242,6 +242,8 @@
   gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (moko_dialer_textview),
                                       gtk_text_buffer_get_insert (buffer));
 
+  g_free (text);
+  g_object_unref (pl);
 }
 
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c	2007-11-12 15:42:11 UTC (rev 3397)
@@ -244,12 +244,14 @@
   if (!priv->pin_mode)
   {
     /* Some autocomplete stuff */
-    matches = moko_contacts_fuzzy_lookup (moko_contacts_get_default (),
-                                          moko_dialer_textview_get_input (
+    gchar *text = moko_dialer_textview_get_input (
                                           MOKO_DIALER_TEXTVIEW (priv->textview), 
-                                          TRUE));
+                                          TRUE);
+    
+    matches = moko_contacts_fuzzy_lookup (moko_contacts_get_default (), text);
     moko_tips_set_matches (MOKO_TIPS (priv->tips), matches);
     g_signal_emit (G_OBJECT (keypad), keypad_signals[DIGIT_PRESSED], 0, digit);
+    g_free (text);
  }
 }
 
@@ -267,10 +269,10 @@
 
   /* Phones use '#' for PIN 'entered' signal */
   if (priv->pin_mode && digit == '#')
-  { 
+  {
     on_dial_clicked (NULL, keypad);
     return;
-  }   
+  }
 
   /* Create a string to insert into the textview */
   buf[0] = digit;
@@ -282,12 +284,14 @@
   if (!priv->pin_mode)
   {
     /* Some autocomplete stuff */
+    gchar *text = moko_dialer_textview_get_input (
+                                          MOKO_DIALER_TEXTVIEW (priv->textview), 
+                                          TRUE);
     matches = moko_contacts_fuzzy_lookup (moko_contacts_get_default (),
-                                          moko_dialer_textview_get_input (
-                                          MOKO_DIALER_TEXTVIEW (priv->textview), 
-                                          TRUE));
+                                          text);
     moko_tips_set_matches (MOKO_TIPS (priv->tips), matches);
     g_signal_emit (G_OBJECT (keypad), keypad_signals[DIGIT_PRESSED], 0, digit);
+    g_free (text);
   }
 }
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-tips.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-tips.c	2007-11-12 12:44:02 UTC (rev 3396)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-tips.c	2007-11-12 15:42:11 UTC (rev 3397)
@@ -84,6 +84,7 @@
                                           GDK_INTERP_BILINEAR);
         
         gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled);
+        g_object_unref (scaled);
       }
       gtk_widget_show (label);
     }





More information about the commitlog mailing list