diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-27 15:45:48 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-27 15:45:48 +0000 |
commit | 101b2d70842dd54cca8ee9d0769e6409593f0627 (patch) | |
tree | a7da5269dfaeaff53e05cecb9c74e18f194698b9 /meta/packages/telepathy | |
parent | 82f18b9e00e18d63144fca6d01bb2cfb46d8ab47 (diff) | |
download | poky-101b2d70842dd54cca8ee9d0769e6409593f0627.tar.gz |
empathy: dropped 0.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3251 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/telepathy')
-rw-r--r-- | meta/packages/telepathy/empathy-0.5/no-gnome.diff | 146 | ||||
-rw-r--r-- | meta/packages/telepathy/empathy_0.5.bb | 17 |
2 files changed, 0 insertions, 163 deletions
diff --git a/meta/packages/telepathy/empathy-0.5/no-gnome.diff b/meta/packages/telepathy/empathy-0.5/no-gnome.diff deleted file mode 100644 index 29d6276f51..0000000000 --- a/meta/packages/telepathy/empathy-0.5/no-gnome.diff +++ /dev/null | |||
@@ -1,146 +0,0 @@ | |||
1 | Index: libempathy-gtk/gossip-ui-utils.c | ||
2 | =================================================================== | ||
3 | --- libempathy-gtk/gossip-ui-utils.c (revision 99) | ||
4 | +++ libempathy-gtk/gossip-ui-utils.c (working copy) | ||
5 | @@ -33,7 +33,7 @@ | ||
6 | #include <glib/gi18n.h> | ||
7 | #include <gtk/gtk.h> | ||
8 | #include <glade/glade.h> | ||
9 | -#include <libgnome/libgnome.h> | ||
10 | +#include <libgnomevfs/gnome-vfs-utils.h> | ||
11 | |||
12 | #include <libmissioncontrol/mc-profile.h> | ||
13 | |||
14 | @@ -1280,13 +1280,14 @@ | ||
15 | gossip_url_show (const char *url) | ||
16 | { | ||
17 | gchar *real_url; | ||
18 | - GError *error = NULL; | ||
19 | + GnomeVFSResult res; | ||
20 | |||
21 | real_url = fixup_url (url); | ||
22 | - gnome_url_show (real_url, &error); | ||
23 | - if (error) { | ||
24 | - g_warning ("Couldn't show URL:'%s'", real_url); | ||
25 | - g_error_free (error); | ||
26 | + res = gnome_vfs_url_show (real_url); | ||
27 | + if (res != GNOME_VFS_OK) { | ||
28 | + g_warning ("Couldn't show URL %s: %s", | ||
29 | + real_url, | ||
30 | + gnome_vfs_result_to_string (res)); | ||
31 | } | ||
32 | |||
33 | g_free (real_url); | ||
34 | Index: src/empathy-chat-main.c | ||
35 | =================================================================== | ||
36 | --- src/empathy-chat-main.c (revision 99) | ||
37 | +++ src/empathy-chat-main.c (working copy) | ||
38 | @@ -28,9 +28,6 @@ | ||
39 | #include <glib/gi18n.h> | ||
40 | #include <gtk/gtk.h> | ||
41 | |||
42 | -#include <libgnome/gnome-program.h> | ||
43 | -#include <libgnomeui/gnome-ui-init.h> | ||
44 | - | ||
45 | #include <libtelepathy/tp-conn.h> | ||
46 | #include <libtelepathy/tp-chan.h> | ||
47 | #include <libmissioncontrol/mc-account.h> | ||
48 | @@ -162,7 +159,6 @@ | ||
49 | main (int argc, char *argv[]) | ||
50 | { | ||
51 | EmpathyChandler *chandler; | ||
52 | - GnomeProgram *program; | ||
53 | gchar *localedir; | ||
54 | |||
55 | localedir = gossip_paths_get_locale_path (); | ||
56 | @@ -171,14 +167,8 @@ | ||
57 | textdomain (GETTEXT_PACKAGE); | ||
58 | g_free (localedir); | ||
59 | |||
60 | - program = gnome_program_init ("empathy-chat", | ||
61 | - PACKAGE_VERSION, | ||
62 | - LIBGNOMEUI_MODULE, | ||
63 | - argc, argv, | ||
64 | - GNOME_PROGRAM_STANDARD_PROPERTIES, | ||
65 | - GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, | ||
66 | - NULL); | ||
67 | - | ||
68 | + gtk_init (&argc, &argv); | ||
69 | + | ||
70 | gtk_window_set_default_icon_name ("empathy"); | ||
71 | |||
72 | if (g_getenv ("EMPATHY_DEBUG")) { | ||
73 | @@ -194,7 +184,6 @@ | ||
74 | |||
75 | gtk_main (); | ||
76 | |||
77 | - g_object_unref (program); | ||
78 | g_object_unref (chandler); | ||
79 | |||
80 | return EXIT_SUCCESS; | ||
81 | Index: src/empathy-main.c | ||
82 | =================================================================== | ||
83 | --- src/empathy-main.c (revision 99) | ||
84 | +++ src/empathy-main.c (working copy) | ||
85 | @@ -28,9 +28,6 @@ | ||
86 | #include <glib/gi18n.h> | ||
87 | #include <gtk/gtk.h> | ||
88 | |||
89 | -#include <libgnome/gnome-program.h> | ||
90 | -#include <libgnomeui/gnome-ui-init.h> | ||
91 | - | ||
92 | #include <libmissioncontrol/mc-account.h> | ||
93 | #include <libmissioncontrol/mc-account-monitor.h> | ||
94 | #include <libmissioncontrol/mission-control.h> | ||
95 | @@ -136,7 +133,6 @@ | ||
96 | McAccountMonitor *monitor; | ||
97 | EmpathyFilter *filter; | ||
98 | gchar *localedir; | ||
99 | - GnomeProgram *program; | ||
100 | gboolean no_connect = FALSE; | ||
101 | GOptionContext *context; | ||
102 | GOptionEntry options[] = { | ||
103 | @@ -157,14 +153,8 @@ | ||
104 | |||
105 | g_set_application_name (PACKAGE_NAME); | ||
106 | |||
107 | - program = gnome_program_init ("empathy", | ||
108 | - PACKAGE_VERSION, | ||
109 | - LIBGNOMEUI_MODULE, | ||
110 | - argc, argv, | ||
111 | - GNOME_PROGRAM_STANDARD_PROPERTIES, | ||
112 | - "goption-context", context, | ||
113 | - GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, | ||
114 | - NULL); | ||
115 | + gtk_init (&argc, &argv); | ||
116 | + /* TODO: option parsing */ | ||
117 | |||
118 | gtk_window_set_default_icon_name ("empathy"); | ||
119 | |||
120 | @@ -204,7 +194,6 @@ | ||
121 | g_object_unref (monitor); | ||
122 | g_object_unref (mc); | ||
123 | g_object_unref (icon); | ||
124 | - g_object_unref (program); | ||
125 | |||
126 | return EXIT_SUCCESS; | ||
127 | } | ||
128 | Index: configure.ac | ||
129 | =================================================================== | ||
130 | --- configure.ac (revision 99) | ||
131 | +++ configure.ac (working copy) | ||
132 | @@ -62,12 +62,13 @@ | ||
133 | |||
134 | PKG_CHECK_MODULES(EMPATHY, | ||
135 | [ | ||
136 | + libxml-2.0 | ||
137 | glib-2.0 >= $GLIB_REQUIRED | ||
138 | gobject-2.0 | ||
139 | gtk+-2.0 >= $GTK_REQUIRED | ||
140 | gconf-2.0 >= $GCONF_REQUIRED | ||
141 | libglade-2.0 >= $LIBGLADE_REQUIRED | ||
142 | - libgnomeui-2.0 | ||
143 | + gnome-vfs-2.0 | ||
144 | libtelepathy >= $TELEPATHY_REQUIRED | ||
145 | libmissioncontrol >= $MISSION_CONTROL_REQUIRED | ||
146 | ]) | ||
diff --git a/meta/packages/telepathy/empathy_0.5.bb b/meta/packages/telepathy/empathy_0.5.bb deleted file mode 100644 index a9578bea30..0000000000 --- a/meta/packages/telepathy/empathy_0.5.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | DESCRIPTION = "Empathy: a Telepathy based IM client" | ||
2 | HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" | ||
3 | LICENSE = "GPL" | ||
4 | DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" | ||
5 | RDEPENDS = "telepathy-mission-control" | ||
6 | RRECOMMENDS = "telepathy-gabble" | ||
7 | |||
8 | PR="r1" | ||
9 | |||
10 | inherit gnome gtk-icon-cache | ||
11 | |||
12 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \ | ||
13 | file://no-gnome.diff;patch=1;pnum=0" | ||
14 | |||
15 | FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ | ||
16 | ${datadir}/dbus-1/services/*.service \ | ||
17 | ${datadir}/telepathy/managers/*.chandler" | ||