This is a manual merge of branch drop split view intro trunk.

[modest] / src / modest-dimming-rule.c

diff --git a/src/modest-dimming-rule.c b/src/modest-dimming-rule.c
index 49621cf..61e40c6 100644 (file)
--- a/src/modest-dimming-rule.c
+++ b/src/modest-dimming-rule.c
@@ -187,7 +187,18 @@ 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 {
+                       if (dimmed)
+                               gtk_widget_hide (priv->widget);
+                       else
+                               gtk_widget_show (priv->widget);
+               }
+#else
                gtk_widget_set_sensitive (priv->widget, !dimmed);
+#endif
        }
 }