author | dcarbery |
Fri, 24 Nov 2006 16:37:59 +0000 | |
branch | 217update |
changeset 19096 | d542fc2c823e |
parent 8348 | e2cf0121c1e2 |
child 8943 | e888e99f531c |
permissions | -rw-r--r-- |
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
1 |
Index: vino/server/vino-main.c |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
2 |
=================================================================== |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
3 |
RCS file: /cvs/gnome/vino/server/vino-main.c,v |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
4 |
retrieving revision 1.3 |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
5 |
diff -u -r1.3 vino-main.c |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
6 |
--- vino/server/vino-main.c 13 Jan 2006 12:12:54 -0000 1.3 |
8348 | 7 |
+++ vino/server/vino-main.c 16 Oct 2006 08:00:54 -0000 |
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
8 |
@@ -30,6 +30,7 @@ |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
9 |
#include "vino-shell.h" |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
10 |
#include "vino-prefs.h" |
5910 | 11 |
#include "vino-util.h" |
12 |
+#include <libgnomeui/libgnomeui.h> |
|
13 |
||
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
14 |
#ifdef HAVE_GNUTLS |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
15 |
#include <gnutls/gnutls.h> |
8348 | 16 |
@@ -55,7 +56,11 @@ |
17 |
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
|
5910 | 18 |
textdomain (GETTEXT_PACKAGE); |
19 |
||
8348 | 20 |
- gtk_init (&argc, &argv); |
5910 | 21 |
+ gnome_program_init ("vino-server", VERSION, |
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
22 |
+ LIBGNOMEUI_MODULE, |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
23 |
+ argc, argv, |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
24 |
+ GNOME_CLIENT_PARAM_SM_CONNECT, FALSE, |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
25 |
+ NULL); |
5910 | 26 |
|
27 |
vino_setup_debug_flags (); |
|
28 |
||
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
29 |
Index: vino/server/vino-shell.c |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
30 |
=================================================================== |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
31 |
RCS file: /cvs/gnome/vino/server/vino-shell.c,v |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
32 |
retrieving revision 1.1.1.1 |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
33 |
diff -u -r1.1.1.1 vino-shell.c |
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
34 |
--- vino/server/vino-shell.c 5 Feb 2004 08:55:03 -0000 1.1.1.1 |
8348 | 35 |
+++ vino/server/vino-shell.c 16 Oct 2006 08:00:54 -0000 |
8311
aafe2c87d873
* patches/vino-01-fix-a11y-hang.diff: Modify patch for version upgrade.
hh150184
parents:
5910
diff
changeset
|
36 |
@@ -45,8 +45,6 @@ |
5910 | 37 |
GSList *reg_env = NULL; |
38 |
char *display_name, *p; |
|
39 |
||
40 |
- bonobo_init (argc, argv); |
|
41 |
- |
|
42 |
shell = g_object_new (vino_shell_get_type (), NULL); |
|
43 |
||
44 |
display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); |