rpms/gnome-phone-manager/devel gnome-phone-manager-econtact.patch, NONE, 1.1 gnome-phone-manager.spec, 1.1, 1.2

[Linus Walleij (snirkel)]

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31885

Modified Files:
	gnome-phone-manager.spec 
Added Files:
	gnome-phone-manager-econtact.patch 
Log Message:
Fixing compilation


gnome-phone-manager-econtact.patch:

--- NEW FILE gnome-phone-manager-econtact.patch ---
--- src/e-contact-entry.c	2006/08/02 22:30:11	1.1
+++ src/e-contact-entry.c	2006/08/02 22:52:03
@@ -250,13 +250,22 @@ view_contacts_added_cb (EBook *book, GLi
     }
 
     photo = e_contact_get (contact, E_CONTACT_PHOTO);
+#ifndef HAVE_ECONTACTPHOTOTYPE
     if (photo) {
+#else
+    if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+#endif
       GdkPixbufLoader *loader;
 
       loader = gdk_pixbuf_loader_new ();
 
+#ifndef HAVE_ECONTACTPHOTOTYPE
       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
 			      photo->length, NULL))
+#else
+      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+			      photo->data.inlined.length, NULL))
+#endif
         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
       if (pixbuf) {
@@ -277,8 +286,9 @@ view_contacts_added_cb (EBook *book, GLi
             pixbuf = tmp;
           }
       }
-      e_contact_photo_free (photo);
     }
+    if (photo)
+      e_contact_photo_free (photo);
     
     gtk_list_store_append (lookup->entry->priv->store, &iter);
     /* At this point the matcher callback gets called */


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-phone-manager.spec	11 Aug 2006 22:20:03 -0000	1.1
+++ gnome-phone-manager.spec	6 Sep 2006 05:51:08 -0000	1.2
@@ -1,10 +1,11 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.7
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
+Patch0:		gnome-phone-manager-econtact.patch
 URL: 		http://usefulinc.com/software/phonemgr/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel
@@ -37,10 +38,12 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags}
+# OK ugly hack but will go when we have g-p-m 0.8 or so...
+make %{?_smp_mflags} CPPFLAGS=-DHAVE_ECONTACTPHOTOTYPE
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -68,6 +71,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Tue Sep 5 2006 Linus Walleij <triad at df.lth.se> 0.7-5
+- Patch to compile with new version of E-D-S.
+
 * Thu Aug 10 2006 Linus Walleij <triad at df.lth.se> 0.7-4
 - Missing BR