callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a couple minor UI bugs.

Browse Source 
Populate the calendar's filter combo.

svn path=/branches/kill-bonobo/; revision=36691
This commit is contained in:
Matthew Barnes
2008-10-27 22:47:50 +00:00
parent 14f54991f3
commit 17e030e202
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/e-shell-window-actions.c
View File

@ -1781,6 +1781,7 @@ shell_window_extract_actions (EShellWindow *shell_window,
{
const gchar *current_view;
GList *match_list = NULL;
GList *primary = NULL;
GList *iter;
/* Pick out the actions from the source list that are tagged
@ -1809,7 +1810,10 @@ shell_window_extract_actions (EShellWindow *shell_window,
if (strcmp (module_name, current_view) != 0)
continue;
match_list = g_list_append (match_list, iter);
if (g_object_get_data (G_OBJECT (action), "primary"))
match_list = g_list_prepend (match_list, iter);
else
match_list = g_list_append (match_list, iter);
}
/* source_list = [B] match_list = [A] -> [C] */

10
shell/e-shell-window.c
View File

@ -742,6 +742,16 @@ e_shell_window_register_new_item_actions (EShellWindow *shell_window,
g_object_set_data (
G_OBJECT (action),
"module-name", (gpointer) module_name);
/* The first action becomes the first item in the "New"
* menu, and consequently its icon is shown in the "New"
* button when the shell module's view is active. This
* is all sorted out in shell_window_extract_actions().
* Note, the data value just needs to be non-zero. */
if (ii == 0)
g_object_set_data (
G_OBJECT (action),
"primary", GINT_TO_POINTER (TRUE));
}
e_shell_window_update_new_menu (shell_window);