Depend on gnome-desktop for gnome-desktop-item, and up the gnome-vfs

2005-02-26  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:

	Depend on gnome-desktop for gnome-desktop-item,
	and up the gnome-vfs dependency version.

	* embed/ephy-embed-persist.c: (ephy_embed_persist_set_user_time),
	(ephy_embed_persist_get_user_time),
	(ephy_embed_persist_set_property),
	(ephy_embed_persist_get_property), (ephy_embed_persist_init),
	(ephy_embed_persist_class_init):
	* embed/ephy-embed-persist.h:

	Add user time property.

	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:

	Forward user time to MozDownload via a string. Not perfect,
	but better than nothing.

	* embed/mozilla/EphyHeaderSniffer.cpp:

	Set user time on filechooser.

	* embed/mozilla/MozDownload.cpp:

	Get user time from content handler, and use it when
	launching the external handler app.

	* lib/ephy-file-helpers.c: (ephy_file_check_mime),
	(launch_desktop_item), (ephy_file_launch_desktop_file),
	(ephy_file_launch_application), (ephy_file_launch_handler):
	* lib/ephy-file-helpers.h:

	Convenience functions to launch an app, or a desktop item,
	with user time.

	* lib/ephy-gui.c: (ephy_gui_confirm_overwrite_file),
	(ephy_gui_window_update_user_time), (ephy_gui_window_present):
	* lib/ephy-gui.h:

	Make our own gtk_window_present, to correctly update user time.
	Check if the path is writable in ephy_gui_confirm_overwrite_file().

	* src/ephy-session.c: (ephy_session_autoresume):

	After showing the recovery dialogue, don't use the old user time
	to launch the windows; use the current event time instead.

	* src/popup-commands.c: (background_download_completed),
	(image_open_uri), (save_source_completed_cb),
	(popup_cmd_open_image):
	* src/window-commands.c: (window_cmd_file_save_as),
	(save_source_completed_cb), (save_temp_source),
	(window_cmd_view_page_source):

	Launch handlers with user time.

1 files changed, 47 insertions, 3 deletions

diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 6b8a18497..954f4c993 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -22,6 +22,7 @@
 
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
+#include "ephy-debug.h"
 
 #include <ctype.h>
 #include <string.h>
@@ -37,6 +38,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtktreeselection.h>
 
+#include <unistd.h>
+
 void
 ephy_gui_sanitise_popup_position (GtkMenu *menu,
 				  GtkWidget *widget,
@@ -190,16 +193,26 @@ ephy_gui_confirm_overwrite_file (GtkWidget *parent,
 				 const char *filename)
 {
 	GtkWidget *dialog;
-	char *display_name;
-	gboolean retval;
+	char *display_name, *path;
+	gboolean retval, writable;
 
 	if (filename == NULL) return FALSE;
 
 	if (!g_file_test (filename, G_FILE_TEST_EXISTS))
 	{
-		return TRUE;
+		/* check if path is writable to */
+		path = g_path_get_dirname (filename);
+		writable = access (path, W_OK) == 0;
+		g_free (path);
+
+		/* FIXME put up some UI to inform the user */
+		return writable;
 	}
 
+	/* check if file is writable */
+	/* FIXME put up some UI to inform the user */
+	if (access (filename, W_OK) != 0) return FALSE;
+
 	display_name = g_filename_display_basename (filename);
 
 	dialog = gtk_message_dialog_new
@@ -349,6 +362,8 @@ void
 ephy_gui_window_update_user_time (GtkWidget *window,
 				  guint32 user_time)
 {
+	LOG ("updating user time on window %p to %d", window, user_time);
+
 	if (user_time != 0)
 	{
 		gtk_widget_realize (window);
@@ -357,3 +372,32 @@ ephy_gui_window_update_user_time (GtkWidget *window,
 	}
 
 }
+
+/* gtk+ bug 166379 */
+/* adapted from gtk+/gtk/gtkwindow.c */
+void
+ephy_gui_window_present (GtkWindow *window,
+			 guint32 user_time)
+{
+	GtkWidget *widget;
+	
+	g_return_if_fail (GTK_IS_WINDOW (window));
+	
+	widget = GTK_WIDGET (window);
+	
+	if (GTK_WIDGET_VISIBLE (window))
+	{
+		g_assert (widget->window != NULL);
+
+		gdk_window_show (widget->window);
+
+		/* note that gdk_window_focus() will also move the window to
+		* the current desktop, for WM spec compliant window managers.
+		*/
+		gdk_window_focus (widget->window, user_time);
+	}
+	else
+	{
+		gtk_widget_show (widget);
+	}
+}