eel r2118 - in trunk: . eel

[ssp svn gnome org]

Author: ssp
Date: Mon Jun  2 00:40:06 2008
New Revision: 2118
URL: http://svn.gnome.org/viewvc/eel?rev=2118&view=rev

Log:
Sun Jun  1 20:39:03 2008  SÃren Sandmann  <sandmann redhat com>

	* eel/eel-background.c: Don't monitor the file anymore; this is
	done by GnomeBG.




Modified:
   trunk/ChangeLog
   trunk/eel/eel-background.c

Modified: trunk/eel/eel-background.c
==============================================================================
--- trunk/eel/eel-background.c	(original)
+++ trunk/eel/eel-background.c	Mon Jun  2 00:40:06 2008
@@ -55,8 +55,6 @@
 							    GdkWindow     *window,
 							    GdkColor      *color,
 							    gboolean      *changes_with_size);
-static void        eel_background_update_file_monitor      (EelBackground *background,
-							    const char    *image_uri);
 static void set_image_properties (EelBackground *background);
 
 EEL_CLASS_BOILERPLATE (EelBackground, eel_background, GTK_TYPE_OBJECT)
@@ -80,7 +78,6 @@
 	
 	char *image_uri;
 	time_t image_mtime;
-	GFileMonitor *image_file_monitor;
 	GnomeBG *bg;
 
 	/* Realized data: */
@@ -189,8 +186,6 @@
 
 	background = EEL_BACKGROUND (object);
 
-	eel_background_update_file_monitor (background, NULL);
-
 	g_free (background->details->color);
 	g_free (background->details->image_uri);
 	eel_background_remove_current_image (background);
@@ -554,45 +549,6 @@
 	g_free (filename);
 }
 
-static void
-background_image_file_changed (GFileMonitor *file_monitor,
-			       GFile *child,
-			       GFile *other_file,
-			       GFileMonitorEvent event_type,
-			       gpointer user_data)
-{
-	EelBackground *background;
-
-	background = EEL_BACKGROUND (user_data);
-
-	eel_background_set_image_uri (background, background->details->image_uri);
-}
-
-static void
-eel_background_update_file_monitor (EelBackground *background,
-				    const char *image_uri)
-{
-	GFile *f;
-
-	if (eel_strcmp (background->details->image_uri, image_uri) == 0) {
-		return;
-	}
-
-	if (background->details->image_file_monitor != NULL) {
-		g_object_unref (background->details->image_file_monitor);
-		background->details->image_file_monitor = NULL;
-	}
-
-	if (image_uri != NULL) {
-		f = g_file_new_for_uri (image_uri);
-
-		background->details->image_file_monitor = g_file_monitor_file (f, 0, NULL, NULL);
-		g_signal_connect (background->details->image_file_monitor, "changed",
-				  G_CALLBACK (background_image_file_changed), background);
-		g_object_unref (f);
-	}
-}
-
 static gboolean
 eel_background_set_image_uri_helper (EelBackground *background,
 				     const char *image_uri,
@@ -621,8 +577,6 @@
 		return FALSE;
 	}
 
-	eel_background_update_file_monitor (background, image_uri);
-
 	if (image_uri != background->details->image_uri) {
 		g_free (background->details->image_uri);
 		background->details->image_uri = g_strdup (image_uri);