ekiga r6863 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Sep  7 17:06:15 2008
New Revision: 6863
URL: http://svn.gnome.org/viewvc/ekiga?rev=6863&view=rev

Log:
Disabled staticpicture as reported by Fabrice.


Modified:
   trunk/ChangeLog
   trunk/src/gui/preferences.cpp

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Sun Sep  7 17:06:15 2008
@@ -267,9 +267,10 @@
  * BEHAVIOR     :  Update of the config database.
  * PRE          :  /
  */
+/*
 static void image_filename_browse_cb (GtkWidget *widget,
 				      gpointer data);
-
+*/
 
 /* DESCRIPTION  :  This callback is called when the user selected a file
  *                 for a sound event
@@ -285,9 +286,10 @@
  * BEHAVIOR     :  Update of the file-selector's image.
  * PRE          :  /
  */
+/*
 static void image_filename_browse_preview_cb (GtkWidget *selector,
                                               gpointer data);
-
+*/
 
 /* DESCRIPTION  :  This callback is called by the preview-play button of the
  * 		   selected audio file in the audio file selector.
@@ -815,15 +817,15 @@
 {
   GmPreferencesWindow *pw = NULL;
 
-  GtkWidget *label = NULL;
+  //GtkWidget *label = NULL;
   GtkWidget *subsection = NULL;
 
-  GtkWidget *button = NULL;
+  //GtkWidget *button = NULL;
 
-  gchar *conf_image = NULL;
-  GtkFileFilter *filefilter = NULL;
-  GtkWidget *preview_image = NULL;
-  GtkWidget *preview_image_frame = NULL;
+  //gchar *conf_image = NULL;
+  //GtkFileFilter *filefilter = NULL;
+  //GtkWidget *preview_image = NULL;
+  //GtkWidget *preview_image_frame = NULL;
 
   PStringArray devs;
 
@@ -874,6 +876,7 @@
   gnome_prefs_int_option_menu_new (subsection, _("Format:"), video_format, VIDEO_DEVICES_KEY "format", _("Select the format for video cameras (does not apply to most USB cameras)"), 2);
 
   /* The file selector button */
+  /* FIXME disabled for now
   label = gtk_label_new (_("Image:"));
 
   button = 
@@ -925,7 +928,7 @@
   g_signal_connect_after (G_OBJECT (button), "selection-changed",
                           G_CALLBACK (image_filename_browse_cb),
                           (gpointer) VIDEO_DEVICES_KEY "image");
-
+  */
   /* That button will refresh the device list */
   gm_pw_add_update_button (prefs_window, container, GTK_STOCK_REFRESH, _("_Detect devices"), GTK_SIGNAL_FUNC (refresh_devices_list_cb), _("Click here to refresh the device list."), 1, prefs_window);
 
@@ -1041,6 +1044,7 @@
 }
 
 
+/*
 static void
 image_filename_browse_cb (GtkWidget *b,
 			  gpointer data)
@@ -1061,12 +1065,9 @@
   g_free (filename);
   g_free (current_filename);
 
-  /* On the very first time, when we only set the file name from the GMC
-   * the update-preview signal isn't sent. We do it manually here on the
-   * "selection-changed" */
   g_signal_emit_by_name (G_OBJECT (b), "update-preview");
 }
-
+*/
 
 static void
 audioev_filename_browse_cb (GtkWidget *b,
@@ -1198,6 +1199,7 @@
 }
 
 
+/*
 static void
 image_filename_browse_preview_cb (GtkWidget *selector,
 				  gpointer data)
@@ -1212,11 +1214,9 @@
 
   filename =
     gtk_file_chooser_get_preview_filename (GTK_FILE_CHOOSER (selector));
-  /* no filename? try next method */
   if (!filename)
     filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector));
 
-  /* FIXME: still no luck? take from config */
   if (!filename)
     filename = gm_conf_get_string (VIDEO_DEVICES_KEY "image");
 
@@ -1234,6 +1234,7 @@
   gtk_file_chooser_set_preview_widget_active (GTK_FILE_CHOOSER (selector),
 					      TRUE);
 }
+*/
 
 
 static void