mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

Add gnome-vfs depends, update icon cache

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1807 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-05-29 14:24:48 +00:00
parent 6c11258fb5
commit 8ca3683347
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/telepathy/empathy-0.5/no-gnome.diff
Vendored
+21 -8
View File
@@ -2,23 +2,35 @@ Index: libempathy-gtk/gossip-ui-utils.c
=================================================================== ===================================================================
--- libempathy-gtk/gossip-ui-utils.c (revision 99) --- libempathy-gtk/gossip-ui-utils.c (revision 99)
+++ libempathy-gtk/gossip-ui-utils.c (working copy) +++ libempathy-gtk/gossip-ui-utils.c (working copy)
@@ -33,7 +33,6 @@ @@ -33,7 +33,7 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glade/glade.h> #include <glade/glade.h>
-#include <libgnome/libgnome.h> -#include <libgnome/libgnome.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
#include <libmissioncontrol/mc-profile.h> #include <libmissioncontrol/mc-profile.h>
@@ -1283,7 +1282,7 @@ @@ -1280,13 +1280,14 @@
GError *error = NULL; gossip_url_show (const char *url)
{
gchar *real_url;
- GError *error = NULL;
+ GnomeVFSResult res;
real_url = fixup_url (url); real_url = fixup_url (url);
- gnome_url_show (real_url, &error); - gnome_url_show (real_url, &error);
+ g_warning ("TODO: gnome_url_show (real_url, &error);"); - if (error) {
if (error) { - g_warning ("Couldn't show URL:'%s'", real_url);
g_warning ("Couldn't show URL:'%s'", real_url); - g_error_free (error);
g_error_free (error); + res = gnome_vfs_url_show (real_url);
+ if (res != GNOME_VFS_OK) {
+ g_warning ("Couldn't show URL %s: %s",
+ real_url,
+ gnome_vfs_result_to_string (res));
}
g_free (real_url);
Index: src/empathy-chat-main.c Index: src/empathy-chat-main.c
=================================================================== ===================================================================
--- src/empathy-chat-main.c (revision 99) --- src/empathy-chat-main.c (revision 99)
@@ -117,7 +129,7 @@ Index: configure.ac
=================================================================== ===================================================================
--- configure.ac (revision 99) --- configure.ac (revision 99)
+++ configure.ac (working copy) +++ configure.ac (working copy)
@@ -62,12 +62,12 @@ @@ -62,12 +62,13 @@
PKG_CHECK_MODULES(EMPATHY, PKG_CHECK_MODULES(EMPATHY,
[ [
@@ -128,6 +140,7 @@ Index: configure.ac
gconf-2.0 >= $GCONF_REQUIRED gconf-2.0 >= $GCONF_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED
- libgnomeui-2.0 - libgnomeui-2.0
+ gnome-vfs-2.0
libtelepathy >= $TELEPATHY_REQUIRED libtelepathy >= $TELEPATHY_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED libmissioncontrol >= $MISSION_CONTROL_REQUIRED
]) ])
meta/packages/telepathy/empathy_0.5.bb
+4 -5
View File
@@ -1,18 +1,17 @@
DESCRIPTION = "Empathy: a Telepathy based IM client" DESCRIPTION = "Empathy: a Telepathy based IM client"
HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
LICENSE = "GPL" LICENSE = "GPL"
DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade" DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs"
RDEPENDS = "telepathy-mission-control" RDEPENDS = "telepathy-mission-control"
RRECOMMENDS = "telepathy-gabble" RRECOMMENDS = "telepathy-gabble"
PR="r0" PR="r1"
inherit gnome inherit gnome gtk-icon-cache
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \
file://no-gnome.diff;patch=1;pnum=0" file://no-gnome.diff;patch=1;pnum=0"
FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/services/*.service \
${datadir}/telepathy/managers/*.chandler \ ${datadir}/telepathy/managers/*.chandler"
${datadir}/icons"