* Fixes NB#92276, initialize a variable

	* Removes an already removed action from the dimming rules

pmo-drop-split-view-r6598

diff --git a/src/hildon2/modest-main-window-ui-dimming.h b/src/hildon2/modest-main-window-ui-dimming.h
index eb3a8ab..478914d 100644 (file)
--- a/src/hildon2/modest-main-window-ui-dimming.h
+++ b/src/hildon2/modest-main-window-ui-dimming.h
@@ -79,7 +79,6 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_send_receive_all) },
        { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) },
        { "/MenuBar/ToolsMenu/ToolsContactsMenu", NULL },
-       { "/MenuBar/ToolsMenu/ToolsSearchMessagesMenu", NULL },
        { "/MenuBar/ToolsMenu/ToolsHelpMenu", NULL },
 
        /* Close Menu */

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 1409a97..76cb853 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -118,7 +118,7 @@ save_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name)
 static gboolean
 restore_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name)
 {
-       GtkRequisition req;
+       GtkRequisition req = {0, 0};
        gchar *key;
 
        key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT);