Update for more recent webkit

diff --git a/configure.ac b/configure.ac
index 187c803e16d64eea3cdb32d5b184437009f0fdc8..c5bf2f54421f3480967d5f0fbb46aefe50828453 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ AC_ARG_ENABLE(webkit,
 if test "x$enable_webkit" != "xno"; then
    PKG_CHECK_MODULES(WEBKIT, 
    [
-      WebKitGtk
+      webkit-1.0
    ], have_webkit="yes", have_webkit="no")
 
    if test "x$have_webkit" = "xyes"; then

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 0865301ba449d9426e735f8e09cf5e22792fd798..ab773b21c2037dc9d17de7718de4aa4ed0a4b995 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -183,10 +183,7 @@ theme_adium_get_default_avatar_filename (EmpathyThemeAdium *theme)
                size = (w + h) / 2;
        }
 
-       /* FIXME: We should not avoid SVG, but old webkit from ubuntu hardy
-        * can't load them correctly. */
-       icon_info = gtk_icon_theme_lookup_icon (icon_theme, "stock_person",
-                                               size, GTK_ICON_LOOKUP_NO_SVG);
+       icon_info = gtk_icon_theme_lookup_icon (icon_theme, "stock_person", size, 0);
        priv->default_avatar_filename = g_strdup (gtk_icon_info_get_filename (icon_info));
        gtk_icon_info_free (icon_info);
 

diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index 090f61c72e87e31c805db195c4fd87007979c297..c31105a1b0fabf6457c73cb66e6d20b57870b752 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_THEME_ADIUM_H__
 #define __EMPATHY_THEME_ADIUM_H__
 
-#include <webkitwebview.h>
+#include <webkit/webkitwebview.h>
 
 #include "empathy-chat-view.h"