#
# Makefile.am
-# Time-stamp: <2007-01-09 17:08:25 (djcb)>
+# Time-stamp: <2007-01-17 16:00:38 (djcb)>
#
#
# use Automake 'trick' ==> convenience static libraries, which
libmodest-ui.la
libmodest_ui_la_SOURCES= \
- modest-account-assistant.c \
- modest-account-assistant.h \
modest-account-view-window.c \
modest-account-view-window.h \
modest-edit-msg-window.c \
modest-transport-widget.c \
modest-transport-widget.h
+# modest-account-assistant.c
+# modest-account-assistant.h
+
LDADD = \
$(MODEST_GSTUFF_LIBS) \
*/
#include <glib/gi18n.h>
#include <tny-account-store.h>
-#include "modest-edit-msg-window.h"
+#include <widgets/modest-edit-msg-window.h>
#include "modest-icon-names.h"
#include "modest-icon-factory.h"
#include "modest-widget-memory.h"
ModestConf *conf;
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
modest_widget_memory_save (conf, G_OBJECT(self), "modest-edit-msg-window");
}
ModestConf *conf;
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
modest_widget_memory_restore (conf, G_OBJECT(self), "modest-edit-msg-window");
}
}
-GtkWidget*
+ModestWindow*
modest_edit_msg_window_new (ModestWidgetFactory *factory,
- GtkUIManager *ui_manager,
+ TnyAccountStore *account_store,
ModestEditType type)
{
GObject *obj;
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
priv->widget_factory = g_object_ref (factory);
- priv->ui_manager = g_object_ref (ui_manager);
+ //priv->ui_manager = g_object_ref (ui_manager);
/* Add accelerators */
gtk_window_add_accel_group (GTK_WINDOW (obj),
g_signal_connect (G_OBJECT(obj), "delete-event",
G_CALLBACK(on_delete_event), obj);
- return GTK_WIDGET (obj);
+ return (ModestWindow*)obj;
}
void
static ModestHeaderView*
header_view_new (ModestMainWindow *self)
{
- int i;
ModestHeaderView *header_view;
ModestMainWindowPrivate *priv;
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
modest_widget_memory_restore (conf,G_OBJECT(self),
"modest-main-window");
ModestConf *conf;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
}
-GtkWidget*
+ModestWindow*
modest_main_window_new (ModestWidgetFactory *widget_factory,
- GtkUIManager *ui_manager)
+ TnyAccountStore *account_store)
{
GObject *obj;
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
priv->widget_factory = g_object_ref (widget_factory);
- priv->ui_manager = g_object_ref (ui_manager);
+ //priv->ui_manager = g_object_ref (ui_manager);
/* Add accelerators */
gtk_window_add_accel_group (GTK_WINDOW (obj),
#include <glib-object.h>
#include <tny-account-store.h>
#include <gtk/gtkactiongroup.h>
-#include "modest-window.h"
-#include "modest-edit-msg-window.h"
+#include <widgets/modest-window.h>
+#include <widgets/modest-edit-msg-window.h>
G_BEGIN_DECLS
gtk_tree_store_append (store, &iter, NULL);
gtk_tree_store_set (store, &iter, 0, _("(empty)"), -1);
-
+
gtk_tree_view_set_model (GTK_TREE_VIEW(self),
GTK_TREE_MODEL(store));
g_object_unref (store);