From 5dc89d6d5a3f5e47ea7b65fdfdbd84ff178625c5 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 15 Jul 2009 15:14:17 +0100 Subject: Temporarily disable account importing as it still depends on profiles --- src/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 42485b7d1..50d317fbb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,8 +39,6 @@ empathy_handwritten_source = \ empathy-chat-window.c empathy-chat-window.h \ empathy-event-manager.c empathy-event-manager.h \ empathy-ft-manager.c empathy-ft-manager.h \ - empathy-import-dialog.c empathy-import-dialog.h \ - empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-main-window.c empathy-main-window.h \ empathy-misc.c empathy-misc.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ -- cgit v1.2.3 From 9f9890593181c881b09773d7f8e68a402d8ce7fa Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sat, 1 Aug 2009 15:12:42 +0200 Subject: Port to libunique --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 50d317fbb..01f47d2bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,6 @@ empathy_handwritten_source = \ empathy_SOURCES = \ $(empathy_handwritten_source) \ - bacon-message-connection.c bacon-message-connection.h \ ephy-spinner.c ephy-spinner.h nodist_empathy_SOURCES = $(BUILT_SOURCES) -- cgit v1.2.3 From 6da962b47b8a9b6bba3aecf8fda82d1e58d547cf Mon Sep 17 00:00:00 2001 From: Arnaud Maillet Date: Tue, 28 Jul 2009 15:55:28 +0200 Subject: Add empathy-import-dialog and empathy-import-pidgin to the makefile --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 01f47d2bb..d0b86edfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,8 @@ empathy_handwritten_source = \ empathy-chat-window.c empathy-chat-window.h \ empathy-event-manager.c empathy-event-manager.h \ empathy-ft-manager.c empathy-ft-manager.h \ + empathy-import-dialog.c empathy-import-dialog.h \ + empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-main-window.c empathy-main-window.h \ empathy-misc.c empathy-misc.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ -- cgit v1.2.3 From a1382ef236e65efb2443268d3ed406229e747381 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sat, 1 Aug 2009 17:33:32 +0200 Subject: Add a first page to the assistant --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index d0b86edfc..9ac6b9bb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ BUILT_SOURCES= \ empathy_handwritten_source = \ empathy.c \ empathy-about-dialog.c empathy-about-dialog.h \ + empathy-account-assistant.c empathy-account-assistant.h \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ empathy-call-window.c empathy-call-window.h \ empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \ -- cgit v1.2.3 From 73a995007e5a417b0e1e0ebf13bdcfdf4dae7c7c Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sat, 1 Aug 2009 19:02:52 +0200 Subject: Implement first page in the assistant --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9ac6b9bb3..d0b86edfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,6 @@ BUILT_SOURCES= \ empathy_handwritten_source = \ empathy.c \ empathy-about-dialog.c empathy-about-dialog.h \ - empathy-account-assistant.c empathy-account-assistant.h \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ empathy-call-window.c empathy-call-window.h \ empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \ -- cgit v1.2.3 From 3ac8eb4e2f6909d6c54718d6910b156359e10b42 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sat, 1 Aug 2009 19:11:33 +0200 Subject: Move back the account assistant to src/ --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index d0b86edfc..9ac6b9bb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ BUILT_SOURCES= \ empathy_handwritten_source = \ empathy.c \ empathy-about-dialog.c empathy-about-dialog.h \ + empathy-account-assistant.c empathy-account-assistant.h \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ empathy-call-window.c empathy-call-window.h \ empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \ -- cgit v1.2.3 From a7e5be33b8ff0bf0cdeaf4672d967e14f80c54eb Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 7 Aug 2009 17:22:55 +0200 Subject: Add the new files to the Makefile.am --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9ac6b9bb3..5d3bee501 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,7 @@ empathy_handwritten_source = \ empathy-event-manager.c empathy-event-manager.h \ empathy-ft-manager.c empathy-ft-manager.h \ empathy-import-dialog.c empathy-import-dialog.h \ + empathy-import-widget.c empathy-import-widget.h \ empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-main-window.c empathy-main-window.h \ empathy-misc.c empathy-misc.h \ -- cgit v1.2.3 From 0e5397ae0e6cc3d75f8e9db19ca872cf28cf41be Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi 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/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 5d3bee501..3641835f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ empathy_handwritten_source = \ empathy-import-dialog.c empathy-import-dialog.h \ empathy-import-widget.c empathy-import-widget.h \ empathy-import-pidgin.c empathy-import-pidgin.h \ + empathy-import-utils.c empathy-import-utils.h \ empathy-main-window.c empathy-main-window.h \ empathy-misc.c empathy-misc.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ -- cgit v1.2.3 From 5b34b46eb22ab9b178144959a23ca99d5b20f3ac Mon Sep 17 00:00:00 2001 From: Arnaud Maillet Date: Sat, 22 Aug 2009 14:54:49 +0200 Subject: Add the mc4 account importer files in the makefile --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 3641835f7..6896c03f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ empathy_handwritten_source = \ empathy-debug-dialog.c empathy-debug-dialog.h \ empathy-chat-window.c empathy-chat-window.h \ empathy-event-manager.c empathy-event-manager.h \ + empathy-import-mc4-accounts.c empathy-import-mc4-accounts.h \ empathy-ft-manager.c empathy-ft-manager.h \ empathy-import-dialog.c empathy-import-dialog.h \ empathy-import-widget.c empathy-import-widget.h \ -- cgit v1.2.3