[empathy] Make buildable and visible if libchamplain not available



commit 966169f0cf3e245c57c4c7461a2715d56e08fa1a
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Tue May 12 11:04:51 2009 -0400

    Make buildable and visible if libchamplain not available
---
 libempathy-gtk/empathy-contact-dialogs.c |    2 --
 libempathy-gtk/empathy-contact-widget.c  |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index a4c05eb..70b605e 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -190,9 +190,7 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
 
 	/* Contact info widget */
 	contact_widget = empathy_contact_widget_new (contact,
-#if HAVE_LIBCHAMPLAIN
 		EMPATHY_CONTACT_WIDGET_SHOW_LOCATION |
-#endif
 		EMPATHY_CONTACT_WIDGET_EDIT_NONE);
 	gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 0828455..4f55132 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1347,6 +1347,7 @@ contact_widget_location_update (EmpathyContactWidget *information)
       gtk_widget_show (information->table_location);
     }
 
+#if HAVE_LIBCHAMPLAIN
   if (/* information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP || */
       information->flags & EMPATHY_CONTACT_WIDGET_SHOW_LOCATION)
     {
@@ -1373,6 +1374,7 @@ contact_widget_location_update (EmpathyContactWidget *information)
 
       champlain_view_center_on (CHAMPLAIN_VIEW(information->map_view), lat, lon);
     }
+#endif
 
     gtk_widget_show (information->vbox_location);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]