1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
Index: libempathy-gtk/gossip-ui-utils.c
===================================================================
--- libempathy-gtk/gossip-ui-utils.c (revision 99)
+++ libempathy-gtk/gossip-ui-utils.c (working copy)
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libgnome/libgnome.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
#include <libmissioncontrol/mc-profile.h>
@@ -1280,13 +1280,14 @@
gossip_url_show (const char *url)
{
gchar *real_url;
- GError *error = NULL;
+ GnomeVFSResult res;
real_url = fixup_url (url);
- gnome_url_show (real_url, &error);
- if (error) {
- g_warning ("Couldn't show URL:'%s'", real_url);
- 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
===================================================================
--- src/empathy-chat-main.c (revision 99)
+++ src/empathy-chat-main.c (working copy)
@@ -28,9 +28,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-
#include <libtelepathy/tp-conn.h>
#include <libtelepathy/tp-chan.h>
#include <libmissioncontrol/mc-account.h>
@@ -162,7 +159,6 @@
main (int argc, char *argv[])
{
EmpathyChandler *chandler;
- GnomeProgram *program;
gchar *localedir;
localedir = gossip_paths_get_locale_path ();
@@ -171,14 +167,8 @@
textdomain (GETTEXT_PACKAGE);
g_free (localedir);
- program = gnome_program_init ("empathy-chat",
- PACKAGE_VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
- NULL);
-
+ gtk_init (&argc, &argv);
+
gtk_window_set_default_icon_name ("empathy");
if (g_getenv ("EMPATHY_DEBUG")) {
@@ -194,7 +184,6 @@
gtk_main ();
- g_object_unref (program);
g_object_unref (chandler);
return EXIT_SUCCESS;
Index: src/empathy-main.c
===================================================================
--- src/empathy-main.c (revision 99)
+++ src/empathy-main.c (working copy)
@@ -28,9 +28,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-account-monitor.h>
#include <libmissioncontrol/mission-control.h>
@@ -136,7 +133,6 @@
McAccountMonitor *monitor;
EmpathyFilter *filter;
gchar *localedir;
- GnomeProgram *program;
gboolean no_connect = FALSE;
GOptionContext *context;
GOptionEntry options[] = {
@@ -157,14 +153,8 @@
g_set_application_name (PACKAGE_NAME);
- program = gnome_program_init ("empathy",
- PACKAGE_VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- "goption-context", context,
- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
- NULL);
+ gtk_init (&argc, &argv);
+ /* TODO: option parsing */
gtk_window_set_default_icon_name ("empathy");
@@ -204,7 +194,6 @@
g_object_unref (monitor);
g_object_unref (mc);
g_object_unref (icon);
- g_object_unref (program);
return EXIT_SUCCESS;
}
Index: configure.ac
===================================================================
--- configure.ac (revision 99)
+++ configure.ac (working copy)
@@ -62,12 +62,13 @@
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
+ gnome-vfs-2.0
libtelepathy >= $TELEPATHY_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
])
|
