projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ModestToolbarDimmingRules to ModestWindowDimmingRules and
[modest]
/
src
/
maemo
/
modest-msg-view-window.c
diff --git
a/src/maemo/modest-msg-view-window.c
b/src/maemo/modest-msg-view-window.c
index
ac61b6a
..
8bc1349
100644
(file)
--- a/
src/maemo/modest-msg-view-window.c
+++ b/
src/maemo/modest-msg-view-window.c
@@
-473,8
+473,8
@@
set_toolbar_mode (ModestMsgViewWindow *self,
/* Sets current toolbar mode */
priv->current_toolbar_mode = mode;
/* Sets current toolbar mode */
priv->current_toolbar_mode = mode;
- /* Update toolbar dimming state */
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+ /* Update window dimming state */
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (self));
switch (mode) {
case TOOLBAR_MODE_NORMAL:
switch (mode) {
case TOOLBAR_MODE_NORMAL:
@@
-730,8
+730,7
@@
modest_msg_view_window_construct (ModestMsgViewWindow *self,
GObject *obj = NULL;
ModestMsgViewWindowPrivate *priv = NULL;
ModestWindowPrivate *parent_priv = NULL;
GObject *obj = NULL;
ModestMsgViewWindowPrivate *priv = NULL;
ModestWindowPrivate *parent_priv = NULL;
- ModestDimmingRulesGroup *menu_rules_group = NULL;
- ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+ ModestDimmingRulesGroup *window_rules_group = NULL;
ModestDimmingRulesGroup *clipboard_rules_group = NULL;
obj = G_OBJECT (self);
ModestDimmingRulesGroup *clipboard_rules_group = NULL;
obj = G_OBJECT (self);
@@
-746,30
+745,27
@@
modest_msg_view_window_construct (ModestMsgViewWindow *self,
gtk_widget_show (parent_priv->menubar);
parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
gtk_widget_show (parent_priv->menubar);
parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
- menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
- toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
+ window_rules_group = modest_dimming_rules_group_new ("ModestWindowDimmingRules", TRUE);
clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE);
/* Add common dimming rules */
clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE);
/* Add common dimming rules */
- modest_dimming_rules_group_add_rules (menu_rules_group,
- modest_msg_view_menu_dimming_entries,
- G_N_ELEMENTS (modest_msg_view_menu_dimming_entries),
- MODEST_WINDOW (self));
- modest_dimming_rules_group_add_rules (toolbar_rules_group,
+ modest_dimming_rules_group_add_rules (window_rules_group,
modest_msg_view_toolbar_dimming_entries,
G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries),
MODEST_WINDOW (self));
modest_msg_view_toolbar_dimming_entries,
G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries),
MODEST_WINDOW (self));
+ modest_dimming_rules_group_add_rules (window_rules_group,
+ modest_msg_view_menu_dimming_entries,
+ G_N_ELEMENTS (modest_msg_view_menu_dimming_entries),
+ MODEST_WINDOW (self));
modest_dimming_rules_group_add_rules (clipboard_rules_group,
modest_msg_view_clipboard_dimming_entries,
G_N_ELEMENTS (modest_msg_view_clipboard_dimming_entries),
MODEST_WINDOW (self));
/* Insert dimming rules group for this window */
modest_dimming_rules_group_add_rules (clipboard_rules_group,
modest_msg_view_clipboard_dimming_entries,
G_N_ELEMENTS (modest_msg_view_clipboard_dimming_entries),
MODEST_WINDOW (self));
/* Insert dimming rules group for this window */
- modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
- modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, window_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
- g_object_unref (menu_rules_group);
- g_object_unref (toolbar_rules_group);
+ g_object_unref (window_rules_group);
g_object_unref (clipboard_rules_group);
restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
g_object_unref (clipboard_rules_group);
restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
@@
-909,8
+905,8
@@
modest_msg_view_window_new_with_header_model (TnyMsg *msg,
gtk_widget_show_all (GTK_WIDGET (window));
modest_msg_view_window_update_priority (window);
gtk_widget_show_all (GTK_WIDGET (window));
modest_msg_view_window_update_priority (window);
- /* Check toolbar dimming rules */
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ /* Check window dimming rules */
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules");
return MODEST_WINDOW(window);
modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules");
return MODEST_WINDOW(window);
@@
-964,8
+960,8
@@
modest_msg_view_window_new_for_attachment (TnyMsg *msg,
tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
- /* Check toolbar dimming rules */
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
+ /* Check window dimming rules */
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (obj));
modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules");
return MODEST_WINDOW(obj);
modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules");
return MODEST_WINDOW(obj);
@@
-976,14
+972,14
@@
void modest_msg_view_window_on_row_changed(
GtkTreePath *arg1,
GtkTreeIter *arg2,
ModestMsgViewWindow *window){
GtkTreePath *arg1,
GtkTreeIter *arg2,
ModestMsgViewWindow *window){
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
}
void modest_msg_view_window_on_row_deleted(
GtkTreeModel *header_model,
GtkTreePath *arg1,
ModestMsgViewWindow *window){
}
void modest_msg_view_window_on_row_deleted(
GtkTreeModel *header_model,
GtkTreePath *arg1,
ModestMsgViewWindow *window){
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
}
/* On insertions we check if the folder still has the message we are
}
/* On insertions we check if the folder still has the message we are
@@
-1021,7
+1017,7
@@
void modest_msg_view_window_on_row_inserted(
select_next_valid_row (priv->header_model,
&(priv->next_row_reference), FALSE);
}
select_next_valid_row (priv->header_model,
&(priv->next_row_reference), FALSE);
}
- modest_ui_actions_check_toolbar_dimming_rules (
+ modest_ui_actions_check_window_dimming_rules (
MODEST_WINDOW (window));
return;
}
MODEST_WINDOW (window));
return;
}
@@
-1071,7
+1067,7
@@
void modest_msg_view_window_on_row_inserted(
select_next_valid_row (priv->header_model,
&(priv->next_row_reference), FALSE);
select_next_valid_row (priv->header_model,
&(priv->next_row_reference), FALSE);
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
}
void modest_msg_view_window_on_row_reordered(
}
void modest_msg_view_window_on_row_reordered(
@@
-1080,7
+1076,7
@@
void modest_msg_view_window_on_row_reordered(
GtkTreeIter *arg2,
gpointer arg3,
ModestMsgViewWindow *window){
GtkTreeIter *arg2,
gpointer arg3,
ModestMsgViewWindow *window){
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
}
/* The modest_msg_view_window_update_model_replaced implements update
}
/* The modest_msg_view_window_update_model_replaced implements update
@@
-1145,7
+1141,7
@@
void modest_msg_view_window_update_model_replaced(
g_object_unref(priv->next_row_reference);
priv->next_row_reference = NULL;
g_object_unref(priv->next_row_reference);
priv->next_row_reference = NULL;
- modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
+ modest_ui_actions_check_window_dimming_rules(MODEST_WINDOW(window));
g_assert(model != NULL);
g_assert(model != NULL);
@@
-1587,7
+1583,7
@@
modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
*
* If the message was not previously downloaded then ask the user
* before downloading. If there is no connection launch the connection
*
* If the message was not previously downloaded then ask the user
* before downloading. If there is no connection launch the connection
- * dialog. Update toolbar dimming rules.
+ * dialog. Update window dimming rules.
*
* Returns: TRUE if the mail operation was started, otherwise if the
* user do not want to download the message, or if the user do not
*
* Returns: TRUE if the mail operation was started, otherwise if the
* user do not want to download the message, or if the user do not
@@
-1651,8
+1647,8
@@
message_reader (ModestMsgViewWindow *window,
modest_mail_operation_get_msg (mail_op, header, view_msg_cb, row_reference);
g_object_unref (mail_op);
modest_mail_operation_get_msg (mail_op, header, view_msg_cb, row_reference);
g_object_unref (mail_op);
- /* Update toolbar dimming rules */
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ /* Update window dimming rules */
+ modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window));
return TRUE;
}
return TRUE;
}