projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified webpage: now tinymail repository is in gitorious.
[modest]
/
src
/
modest-utils.c
diff --git
a/src/modest-utils.c
b/src/modest-utils.c
index
d611f3e
..
d578895
100644
(file)
--- a/
src/modest-utils.c
+++ b/
src/modest-utils.c
@@
-37,9
+37,6
@@
#include <tny-camel-account.h>
#include <tny-status.h>
#include <tny-camel-send-queue.h>
#include <tny-camel-account.h>
#include <tny-status.h>
#include <tny-camel-send-queue.h>
-#include <tny-camel-transport-account.h>
-#include <tny-camel-imap-store-account.h>
-#include <tny-camel-pop-store-account.h>
#include <locale.h>
#include <modest-defs.h>
#include "modest-utils.h"
#include <locale.h>
#include <modest-defs.h>
#include "modest-utils.h"
@@
-49,7
+46,6
@@
#include "modest-text-utils.h"
#include <modest-local-folder-info.h>
#include "widgets/modest-header-view.h"
#include "modest-text-utils.h"
#include <modest-local-folder-info.h>
#include "widgets/modest-header-view.h"
-#include "widgets/modest-main-window.h"
#include "modest-widget-memory.h"
#include "widgets/modest-sort-criterium-view.h"
#include "widgets/modest-header-window.h"
#include "modest-widget-memory.h"
#include "widgets/modest-sort-criterium-view.h"
#include "widgets/modest-header-window.h"
@@
-552,6
+548,7
@@
launch_sort_headers_dialog (ModestWindow *parent_window,
gint attachments_sort_id;
gint priority_sort_id;
GtkTreeSortable *sortable;
gint attachments_sort_id;
gint priority_sort_id;
GtkTreeSortable *sortable;
+ GtkTreeModel *filter;
/* Get header window */
if (MODEST_IS_HEADER_WINDOW (parent_window)) {
/* Get header window */
if (MODEST_IS_HEADER_WINDOW (parent_window)) {
@@
-617,7
+614,8
@@
launch_sort_headers_dialog (ModestWindow *parent_window,
sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
- sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+ filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)));
/* Launch dialogs */
if (!gtk_tree_sortable_get_sort_column_id (sortable,
¤t_sort_colid, ¤t_sort_type)) {
/* Launch dialogs */
if (!gtk_tree_sortable_get_sort_column_id (sortable,
¤t_sort_colid, ¤t_sort_type)) {
@@
-681,13
+679,15
@@
modest_utils_run_sort_dialog (ModestWindow *parent_window,
ModestSortDialogType type)
{
GtkWidget *dialog = NULL;
ModestSortDialogType type)
{
GtkWidget *dialog = NULL;
+ GtkWindow *toplevel;
/* Build dialog */
/* Build dialog */
- dialog = modest_platform_create_sort_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)));
+ toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (parent_window));
+ dialog = modest_platform_create_sort_dialog (toplevel);
if (dialog == NULL)
return;
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
if (dialog == NULL)
return;
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
- GTK_WINDOW (dialog), parent_window);
+ GTK_WINDOW (dialog), toplevel);
/* Fill sort keys */
switch (type) {
/* Fill sort keys */
switch (type) {
@@
-822,7
+822,7
@@
modest_utils_on_entry_invalid_character (ModestValidatingEntry *self,
show_char = "' '";
}
show_char = "' '";
}
- message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char);
+ message = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, show_char);
modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
g_free (message);
}
modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
g_free (message);
}