From 30a2f55dc7195ae25ff931547e42778b15e114f3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Apr 2007 19:46:31 +0000 Subject: empathy: merge with poky --- packages/telepathy/empathy-0.1/no-gnome.diff | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 packages/telepathy/empathy-0.1/no-gnome.diff (limited to 'packages/telepathy/empathy-0.1/no-gnome.diff') diff --git a/packages/telepathy/empathy-0.1/no-gnome.diff b/packages/telepathy/empathy-0.1/no-gnome.diff new file mode 100644 index 0000000000..4dd4a96354 --- /dev/null +++ b/packages/telepathy/empathy-0.1/no-gnome.diff @@ -0,0 +1,39 @@ +diff -ur empathy-0.1.orig/configure.ac empathy-0.1/configure.ac +--- empathy-0.1.orig/configure.ac 2007-04-25 23:05:40.000000000 +0100 ++++ empathy-0.1/configure.ac 2007-04-27 17:10:29.000000000 +0100 +@@ -39,12 +39,12 @@ + + PKG_CHECK_MODULES(EMPATHY, + [ ++ libxml-2.0 + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + gtk+-2.0 >= $GTK_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED +- libgnomeui-2.0 + libtelepathy >= $TELEPATHY_REQUIRED + libmissioncontrol >= $MISSION_CONTROL_REQUIRED + ]) +Only in empathy-0.1: configure.ac~ +diff -ur empathy-0.1.orig/libempathy-gtk/gossip-ui-utils.c empathy-0.1/libempathy-gtk/gossip-ui-utils.c +--- empathy-0.1.orig/libempathy-gtk/gossip-ui-utils.c 2007-04-25 23:05:40.000000000 +0100 ++++ empathy-0.1/libempathy-gtk/gossip-ui-utils.c 2007-04-27 17:06:48.000000000 +0100 +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include + +@@ -1307,7 +1306,7 @@ + GError *error = NULL; + + real_url = fixup_url (url); +- gnome_url_show (real_url, &error); ++ g_warning ("TODO: gnome_url_show (real_url, &error);"); + if (error) { + g_warning ("Couldn't show URL:'%s'", real_url); + g_error_free (error); +Only in empathy-0.1/libempathy-gtk: gossip-ui-utils.c~ -- cgit v1.2.3