[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.13, 1.14

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6785/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Set the location entry text once a file has been selected.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** player.cpp	10 Feb 2007 04:16:10 -0000	1.13
--- player.cpp	10 Feb 2007 04:31:53 -0000	1.14
***************
*** 51,54 ****
--- 51,57 ----
          OpenvrmlPlayerFileChooserDialog * dialog);
      void openvrml_player_on_locationentry_activated(GtkEntry * entry);
+     void openvrml_player_on_filechooserdialog_response(GtkDialog * dialog,
+                                                        gint arg1,
+                                                        gpointer user_data);
      void openvrml_player_quit();
  
***************
*** 190,193 ****
--- 193,203 ----
                                   GTK_WINDOW(app_window));
  
+     GtkWidget * const location_entry =
+         glade_xml_get_widget(xml, "locationentry");
+     g_signal_connect(file_chooser_dialog,
+                      "response",
+                      G_CALLBACK(openvrml_player_on_filechooserdialog_response),
+                      location_entry);
+ 
      //
      // The OPENVRML_XEMBED environment variable overrides the default
***************
*** 324,329 ****
                         &req_data);
  
!     GtkWidget * const window = glade_xml_get_widget(xml, "window");
!     gtk_widget_show(window);
  
      gtk_main();
--- 334,338 ----
                         &req_data);
  
!     gtk_widget_show(app_window);
  
      gtk_main();
***************
*** 823,826 ****
--- 832,850 ----
  }
  
+ void openvrml_player_on_filechooserdialog_response(GtkDialog * const dialog,
+                                                    const gint arg1,
+                                                    const gpointer user_data)
+ {
+     if (arg1 == GTK_RESPONSE_ACCEPT) {
+         GtkEntry * const location_entry = static_cast<GtkEntry *>(user_data);
+         gchar * uri = 0;
+         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
+         g_return_if_fail(uri);
+         scope_guard uri_guard = make_guard(g_free, uri);
+         boost::ignore_unused_variable_warning(uri_guard);
+         gtk_entry_set_text(location_entry, uri);
+     }
+ }
+ 
  //
  // Start the quit dance.  We just shut down the I/O channels here.  When the