From: Roman Moravcik <roman.moravcik@gmail.com>
Date: Tue, 16 Mar 2010 18:16:13 +0000 (+0100)
Subject: imported version 0.1-1
X-Git-Tag: v0.1-1
X-Git-Url: http://git.maemo.org/git/?p=birthday;a=commitdiff_plain;h=be324e6cf2f00a5e7f701183e2d5522395ed61f7

imported version 0.1-1
---

diff --git a/debian/changelog b/debian/changelog
index 971055f..6125b8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
+birthday (0.1-1) fremantle; urgency=low
+
+  * Temporary disabled loading of avatars, because application was crashing.
+
+ -- Roman Moravcik <roman.moravcik@gmail.com>  Wed, 10 Mar 2010 16:08:56 +0100
+
 birthday (0.1-0) fremantle; urgency=low
 
   * Initial release.
 
- -- Roman Moravcik <roman.moravcik@gmail.com>  Mon, 14 Sep 2009 17:38:11 +0200
+ -- Roman Moravcik <roman.moravcik@gmail.com>  Wed, 10 Mar 2010 10:47:23 +0100
diff --git a/debian/control b/debian/control
index ce2d116..d7b6237 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: birthday
 Section: user/desktop
 Architecture: any
 Depends: ${shlibs:Depends}
-XB-Description: Displays birthdays of your contacts.
+XB-Description: Displays birthdays of your contacts
  Simple application for displaying birthdays of your contacts.
 XB-Maemo-Display-Name: Birthday
 XB-Maemo-Icon-26:
diff --git a/src/birthday.c b/src/birthday.c
index e4881f1..f1d90f8 100644
--- a/src/birthday.c
+++ b/src/birthday.c
@@ -161,19 +161,28 @@ create_bday_liststore(GList *contacts)
 			gchar *display_column = NULL;
 			gchar *next_birthday_text = NULL;
 
+#if 0
 			photo = e_contact_get (E_CONTACT (contact->data), E_CONTACT_PHOTO);
-
 			if (photo) {
 				avatar_filename = g_filename_from_uri (photo->data.uri, NULL, NULL);
 				if (avatar_filename) {
-					avatar = gdk_pixbuf_new_from_file_at_size (avatar_filename, 48, 48, &error);
+					gint height = 0;
+
+					avatar = gdk_pixbuf_new_from_file (avatar_filename, &error);
+					height = gdk_pixbuf_get_height (avatar);
+					if (height != 48) {
+						gint new_height = 48;
+						gint new_width = (int) new_height * gdk_pixbuf_get_width (avatar) / height;
+						gdk_pixbuf_scale_simple (avatar, new_width, new_height, GDK_INTERP_BILINEAR);
+					}
 					g_free (avatar_filename);
-					avatar_filename = NULL;
 				}
-				
+				avatar_filename = NULL;
 			} else {
 				avatar = gdk_pixbuf_new_from_file ("/usr/share/icons/hicolor/48x48/hildon/general_default_avatar.png", &error);
 			}
+#endif
+				avatar = gdk_pixbuf_new_from_file ("/usr/share/icons/hicolor/48x48/hildon/general_default_avatar.png", &error);
 
 			fullname = e_contact_get (E_CONTACT (contact->data), E_CONTACT_FULL_NAME);
 			age = calc_age(bdate);
@@ -193,7 +202,10 @@ create_bday_liststore(GList *contacts)
 			if (next_birthday_text)
 				g_free (next_birthday_text);
 			next_birthday_text = NULL;
+
+			e_contact_date_free (bdate);
 		}
+		bdate = NULL;
 	}
 
 	if (text_font)
@@ -245,17 +257,18 @@ create_main_window(GtkListStore *store)
 
 	/* pannable for tree view */
 	pannable = hildon_pannable_area_new ();
+	g_object_set (G_OBJECT (pannable), "mov-mode", HILDON_MOVEMENT_MODE_VERT, NULL);
 	gtk_container_add (GTK_CONTAINER (alignment), pannable);
 
 	/* tree view */
 	tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
-	gtk_container_add(GTK_CONTAINER(pannable), tree_view);
+	gtk_container_add (GTK_CONTAINER (pannable), tree_view);
 	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
 					      COLUMN_NEXT_BIRTHDAY, GTK_SORT_ASCENDING);
 
 	/* display column */
 	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_fixed_width (column, 704);
+	gtk_tree_view_column_set_fixed_width (column, 696);
 	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
@@ -277,8 +290,6 @@ create_main_window(GtkListStore *store)
 					     NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 
-
-
 	/* window signals */
 	g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
@@ -339,10 +350,10 @@ int main (int argc, char **argv)
 		goto exit;
 	}
 
-	store = create_bday_liststore(contacts);
-	window = create_main_window(store);
+	store = create_bday_liststore (contacts);
+	window = create_main_window (store);
 
-	gtk_main();
+	gtk_main ();
 
 exit:
 	osso_deinitialize (osso_context);