| author | rohinis |
| Tue, 29 Nov 2011 17:32:55 +0000 | |
| branch | s11express-2010-11 |
| changeset 22234 | c23e64da3e06 |
| parent 18133 | faf0b65f9de5 |
| permissions | -rw-r--r-- |
|
18133
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
1 |
From d11ec091a9eaa2a96b277af0e18677df5b544589 Mon Sep 17 00:00:00 2001 |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
2 |
From: Brian Lu <[email protected]> |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
3 |
Date: Sun, 13 Jun 2010 11:57:58 +0800 |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
4 |
Subject: [PATCH] Fix the bug bgo#621419 |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
5 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
6 |
--- |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
7 |
src/gui/assistant.cpp | 4 +--- |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
8 |
1 files changed, 1 insertions(+), 3 deletions(-) |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
9 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
10 |
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
11 |
index ab187d4..600483a 100644 |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
12 |
--- a/src/gui/assistant.cpp |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
13 |
+++ b/src/gui/assistant.cpp |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
14 |
@@ -1562,8 +1562,8 @@ ekiga_assistant_cancel (GtkAssistant *gtkassistant) |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
15 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
16 |
main_window = GnomeMeeting::Process ()->GetMainWindow (); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
17 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
18 |
- gtk_widget_hide (GTK_WIDGET (gtkassistant)); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
19 |
gtk_assistant_set_current_page (gtkassistant, 0); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
20 |
+ gtk_widget_hide (GTK_WIDGET (gtkassistant)); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
21 |
gtk_widget_show (main_window); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
22 |
} |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
23 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
24 |
@@ -1619,8 +1619,6 @@ ekiga_assistant_new (Ekiga::ServiceCore *core) |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
25 |
assistant->priv->core = core; |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
26 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
27 |
/* FIXME: move this into the caller */ |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
28 |
- g_signal_connect (assistant, "cancel", |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
29 |
- G_CALLBACK (gtk_widget_hide), NULL); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
30 |
g_signal_connect (assistant, "key-press-event", |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
31 |
G_CALLBACK (ekiga_assistant_key_press_cb), NULL); |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
32 |
|
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
33 |
-- |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
34 |
1.5.6.5 |
|
faf0b65f9de5
2010-06-17 Brian Lu <set EMAIL_ADDRESS environment variable>
hawklu
parents:
diff
changeset
|
35 |