X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-dimming-rule.c;h=7e834be21c5aafd43a334e805e03aae862dc31ea;hp=b17995229a811c353632cb87156e910f519798ba;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=9be03ff09f3ae25ef904bfb1c7bcb4f637d0c57b

diff --git a/src/modest-dimming-rule.c b/src/modest-dimming-rule.c
index b179952..7e834be 100644
--- a/src/modest-dimming-rule.c
+++ b/src/modest-dimming-rule.c
@@ -28,6 +28,7 @@
  */
 
 #include "modest-dimming-rule.h"
+#include "modest-ui-dimming-manager.h"
 
 static void modest_dimming_rule_class_init (ModestDimmingRuleClass *klass);
 static void modest_dimming_rule_init       (ModestDimmingRule *obj);
@@ -187,24 +188,22 @@ modest_dimming_rule_process (ModestDimmingRule *self)
 		else
 			g_printerr ("modest: action path '%s' has not associatd action\n", priv->action_path);
 	} else if (priv->widget != NULL) {
-#ifdef MODEST_TOOLKIT_HILDON2
-		if (GTK_IS_TOOL_ITEM (priv->widget)) {
-			gtk_widget_set_sensitive (priv->widget, !dimmed);
-		} else {
-			GtkWidget *parent;
-			parent = gtk_widget_get_parent (priv->widget);
-			if (parent && HILDON_IS_APP_MENU (parent)) {
-				if (dimmed)
-					gtk_widget_hide (priv->widget);
-				else
-					gtk_widget_show (priv->widget);
+		ModestUIDimmingMode mode;
+
+		mode = modest_ui_dimming_manager_get_widget_dimming_mode (priv->widget);
+		switch (mode) {
+		case MODEST_UI_DIMMING_MODE_HIDE:
+			if (dimmed) {
+				gtk_widget_hide (GTK_WIDGET (priv->widget));
 			} else {
-				gtk_widget_set_sensitive (priv->widget, !dimmed);
+				gtk_widget_show (GTK_WIDGET (priv->widget));
 			}
+			break;
+		case MODEST_UI_DIMMING_MODE_DIM:
+		default:
+			gtk_widget_set_sensitive (priv->widget, !dimmed);
+			break;
 		}
-#else
-		gtk_widget_set_sensitive (priv->widget, !dimmed);
-#endif
 	}
 }