ekiga r6387 - in trunk: . src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Jun 12 12:13:49 2008
New Revision: 6387
URL: http://svn.gnome.org/viewvc/ekiga?rev=6387&view=rev

Log:
Merge branch 'bugfixing'


Modified:
   trunk/ChangeLog
   trunk/src/gui/assistant.cpp
   trunk/src/gui/main.cpp

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Thu Jun 12 12:13:49 2008
@@ -47,6 +47,7 @@
 #include "videoinput-core.h"
 #include "audioinput-core.h"
 #include "audiooutput-core.h"
+#include <gdk/gdkkeysyms.h>
 
 G_DEFINE_TYPE(EkigaAssistant, ekiga_assistant, GTK_TYPE_ASSISTANT);
 
@@ -1249,6 +1250,20 @@
   g_type_class_add_private (klass, sizeof (EkigaAssistantPrivate));
 }
 
+static gboolean
+ekiga_assistant_key_press_cb (GtkWidget *widget,
+			      GdkEventKey *event,
+			      G_GNUC_UNUSED gpointer user_data)
+{
+  if (event->keyval == GDK_Escape) {
+
+    gtk_widget_hide (widget);
+    return TRUE;  /* do not propagate the key to parent */
+  }
+
+  return FALSE; /* propagate what we don't treat */
+}
+
 GtkWidget *
 ekiga_assistant_new (Ekiga::ServiceCore *core)
 {
@@ -1260,6 +1275,8 @@
   /* FIXME: move this into the caller */
   g_signal_connect (assistant, "cancel",
                     G_CALLBACK (gtk_widget_hide), NULL);
+  g_signal_connect (assistant, "key-press-event",
+                    G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
 
   sigc::connection conn;
   Ekiga::VideoInputCore *videoinput_core = dynamic_cast<Ekiga::VideoInputCore *> (core->get ("videoinput-core"));

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Jun 12 12:13:49 2008
@@ -2193,6 +2193,8 @@
   item = gtk_tool_item_new ();
   mw->preview_button = gtk_toggle_button_new ();
   gtk_button_set_relief (GTK_BUTTON (mw->preview_button), GTK_RELIEF_NONE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mw->preview_button),
+								gm_conf_get_bool (VIDEO_DEVICES_KEY "enable_preview"));
   image = gtk_image_new_from_icon_name (GM_ICON_CAMERA_VIDEO, 
                                         GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (mw->preview_button), image);