diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2008-07-17 04:45:27 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-06-12 00:06:28 +0800 |
| commit | 41e4816144f6e9ace93b0497f35c6aee480fa1c5 (patch) | |
| tree | 63a22e580b5fa39218c167c4c14a63bf1360423a | |
| parent | c701544eca086e1d87f8f3539580a37c6fcd3931 (diff) | |
| download | gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar.gz gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar.bz2 gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar.lz gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar.xz gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.tar.zst gsoc2013-empathy-41e4816144f6e9ace93b0497f35c6aee480fa1c5.zip | |
Update for more recent webkit
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 5 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 187c803e1..c5bf2f544 100644 --- 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 0865301ba..ab773b21c 100644 --- 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 090f61c72..c31105a1b 100644 --- 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" |