fish: fix adding back after removal

These two "changed" functions get triggered by clearing gsettings values on exit, make them return immediately when this happens. Don't return from dispose on repeat call or applet can't be added back

1 files changed, 6 insertions, 3 deletions

diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 4685b9d6..95b22833 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -995,6 +995,9 @@ static void display_fortune_dialog(FishApplet* fish)
 
 static void name_changed_notify(GSettings* settings, gchar* key, FishApplet* fish)
 {
+	if (fish->source_id == 0)
+		return;
+
 	char *value;
 
 	value = g_settings_get_string (settings, key);
@@ -1020,6 +1023,9 @@ static void name_changed_notify(GSettings* settings, gchar* key, FishApplet* fis
 
 static void image_changed_notify(GSettings* settings, gchar* key, FishApplet* fish)
 {
+	if (fish->source_id == 0)
+		return;
+
 	char *value;
 
 	value = g_settings_get_string (settings, key);
@@ -1772,9 +1778,6 @@ static void fish_applet_dispose (GObject *object)
 {
 	FishApplet* fish = (FishApplet*) object;
 
-	if (fish->source_id == 0)
-		return;
-
 	if (fish->timeout)
 	{
 		g_source_remove (fish->timeout);