* add compact display as default, some icons

pmo-trunk-r140

diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
index fbb4d3b..6a4b3e0 100644 (file)
--- a/src/gtk-glade/Makefile.am
+++ b/src/gtk-glade/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2006-05-29 23:12:07 (djcb)>
+# Time-stamp: <2006-06-02 14:23:35 (djcb)>
 #
 #
 # use Automake 'trick' ==> convenience static libraries, which
@@ -8,9 +8,7 @@
 #
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_GTK_CFLAGS) \
-       $(MODEST_GLADE_CFLAGS) \
-       $(MODEST_TINYMAIL_CFLAGS)\
+       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        -DPREFIX=\"@prefix@\"
 
 noinst_LTLIBRARIES=\
@@ -28,9 +26,7 @@ libmodest_ui_la_SOURCES=\
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_GTK_LIBS) \
-       $(MODEST_GLADE_LIBS) \
-       $(MODEST_TINYMAIL_LIBS)
+       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
 
 EXTRA_DIST=pixmaps/*.png pixmaps/*.xpm modest.glade modest.gladep
 

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index 478e756..5fbb3f8 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -7,13 +7,13 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-/* TODO: put in auto* */
-#include <tny-text-buffer-stream.h>
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
+/* TODO: put in auto* */
+#include <tny-text-buffer-stream.h>
+
 #include "../modest-ui.h"
 #include "../modest-window-mgr.h"
 #include "../modest-account-mgr.h"
@@ -634,9 +634,7 @@ modest_main_window_header_tree (TnyMsgFolderIface *folder)
        ModestTnyHeaderTreeViewColumn cols[] = {
                MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE,
                MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH,
-               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM,
-               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT,
-               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER
        };
        
        for (i = 0 ; i != sizeof(cols)/sizeof(ModestTnyHeaderTreeViewColumn); ++i)
@@ -818,8 +816,8 @@ on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
 
        id_mgr = priv->modest_id_mgr;
        email_from = modest_identity_mgr_get_identity_string(id_mgr,
-                                                                                                                MODEST_IDENTITY_DEFAULT_IDENTITY,
-                                                                                                                MODEST_IDENTITY_EMAIL, NULL);
+                                                            MODEST_IDENTITY_DEFAULT_IDENTITY,
+                                                            MODEST_IDENTITY_EMAIL, NULL);
                        
        g_message("sending \"%s\" %s ==> %s", subject, email_from, to);
        modest_tny_transport_actions_send_message (actions,

diff --git a/src/gtk-glade/pixmaps/qgn_list_messagin_mail.png b/src/gtk-glade/pixmaps/qgn_list_messagin_mail.png
new file mode 100644 (file)
index 0000000..4038776
Binary files /dev/null and b/src/gtk-glade/pixmaps/qgn_list_messagin_mail.png differ

diff --git a/src/gtk-glade/pixmaps/qgn_list_messagin_mail_unread.png b/src/gtk-glade/pixmaps/qgn_list_messagin_mail_unread.png
new file mode 100644 (file)
index 0000000..3d15a38
Binary files /dev/null and b/src/gtk-glade/pixmaps/qgn_list_messagin_mail_unread.png differ