From 2f019885754917e5130b35d167cadb4c5ca966d5 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 7 Aug 2009 17:21:56 +0200
Subject: Split EmpathyImportDialog and EmpathyImportWidget

Also, take this as a chance to GObject-ify everything.
---
 src/empathy-import-widget.h | 68 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/empathy-import-widget.h

(limited to 'src/empathy-import-widget.h')

diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
new file mode 100644
index 000000000..8af953d79
--- /dev/null
+++ b/src/empathy-import-widget.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2008-2009 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
+ */
+
+/* empathy-import-widget.h */
+
+#ifndef __EMPATHY_IMPORT_WIDGET_H__
+#define __EMPATHY_IMPORT_WIDGET_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_IMPORT_WIDGET empathy_import_widget_get_type()
+#define EMPATHY_IMPORT_WIDGET(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_IMPORT_WIDGET,\
+      EmpathyImportWidget))
+#define EMPATHY_IMPORT_WIDGET_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_IMPORT_WIDGET,\
+      EmpathyImportWidgetClass))
+#define EMPATHY_IS_IMPORT_WIDGET(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_IMPORT_WIDGET))
+#define EMPATHY_IS_IMPORT_WIDGET_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_IMPORT_WIDGET))
+#define EMPATHY_IMPORT_WIDGET_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_IMPORT_WIDGET,\
+      EmpathyImportWidgetClass))
+
+typedef struct {
+  GObject parent;
+
+  /* private */
+  gpointer priv;
+} EmpathyImportWidget;
+
+typedef struct {
+  GObjectClass parent_class;
+} EmpathyImportWidgetClass;
+
+GType empathy_import_widget_get_type (void);
+
+EmpathyImportWidget* empathy_import_widget_new (void);
+
+GtkWidget * empathy_import_widget_get_widget (EmpathyImportWidget *self);
+
+void empathy_import_widget_add_selected_accounts (EmpathyImportWidget *self);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_IMPORT_WIDGET_H__ */
-- 
cgit v1.2.3


From 0e5397ae0e6cc3d75f8e9db19ca872cf28cf41be Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sun, 9 Aug 2009 17:48:57 +0200
Subject: Make the import system more future-proof

Split the utilities from the widget and the dialog; we now have an enum
for supported applications, with a special value which means "all
applications", which is the only one which triggers showing the "Source"
column in EmpathyImportWidget. We need this to avoid being redundant in
the EmpathyAccountAssistant, as we already choose there the application
from which to import.
---
 src/empathy-import-widget.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/empathy-import-widget.h')

diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 8af953d79..48f2e1d48 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -27,6 +27,8 @@
 
 #include <glib-object.h>
 
+#include "empathy-import-utils.h"
+
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_IMPORT_WIDGET empathy_import_widget_get_type()
@@ -57,7 +59,7 @@ typedef struct {
 
 GType empathy_import_widget_get_type (void);
 
-EmpathyImportWidget* empathy_import_widget_new (void);
+EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id);
 
 GtkWidget * empathy_import_widget_get_widget (EmpathyImportWidget *self);
 
-- 
cgit v1.2.3