phonemgr r326 - in trunk: . cut-n-paste/e-contact-entry

[hadess svn gnome org]

Author: hadess
Date: Mon Dec 15 17:35:45 2008
New Revision: 326
URL: http://svn.gnome.org/viewvc/phonemgr?rev=326&view=rev

Log:
2008-12-15  Bastien Nocera  <hadess hadess net>

	* cut-n-paste/e-contact-entry/e-contact-entry.c:
	* cut-n-paste/e-contact-entry/e-contact-entry.h: Update from SVN



Modified:
   trunk/ChangeLog
   trunk/cut-n-paste/e-contact-entry/e-contact-entry.c
   trunk/cut-n-paste/e-contact-entry/e-contact-entry.h

Modified: trunk/cut-n-paste/e-contact-entry/e-contact-entry.c
==============================================================================
--- trunk/cut-n-paste/e-contact-entry/e-contact-entry.c	(original)
+++ trunk/cut-n-paste/e-contact-entry/e-contact-entry.c	Mon Dec 15 17:35:45 2008
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  * Authors: Ross Burton <ross burtonini com>
  */
@@ -38,12 +38,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-
 #include <libedataserver/e-source.h>
 #include <libebook/e-book.h>
 #include <libebook/e-book-view.h>
@@ -501,7 +495,6 @@
     sources = e_source_group_peek_sources (group);
     for (m = sources; m != NULL; m = m->next) {
       ESource *source = m->data;
-      const char *p;
       ESource *s = e_source_copy (source);
       EntryLookup *lookup;
       char *uri;
@@ -518,7 +511,7 @@
 
       if ((lookup->book = e_book_new (s, &error)) == NULL) {
         /* TODO handle this better, fire the error signal I guess */
-        g_warning (error->message);
+        g_warning ("%s", error->message);
 	g_error_free (error);
 	g_free (lookup);
       } else {

Modified: trunk/cut-n-paste/e-contact-entry/e-contact-entry.h
==============================================================================
--- trunk/cut-n-paste/e-contact-entry/e-contact-entry.h	(original)
+++ trunk/cut-n-paste/e-contact-entry/e-contact-entry.h	Mon Dec 15 17:35:45 2008
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  * Authors: Ross Burton <ross burtonini com>
  */
@@ -26,7 +26,7 @@
 #include <libedataserver/e-source-group.h>
 #include <libedataserver/e-source-list.h>
 #include <libebook/e-contact.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS