empathy r1234 - in trunk: docs/libempathy-gtk libempathy-gtk python/pyempathygtk src
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r1234 - in trunk: docs/libempathy-gtk libempathy-gtk python/pyempathygtk src
- Date: Tue, 15 Jul 2008 13:22:59 +0000 (UTC)
Author: xclaesse
Date: Tue Jul 15 13:22:58 2008
New Revision: 1234
URL: http://svn.gnome.org/viewvc/empathy?rev=1234&view=rev
Log:
Moved empathy-accounts-dialog from libempathy-gtk to src. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>
Added:
trunk/src/empathy-accounts-dialog.c
- copied, changed from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.c
trunk/src/empathy-accounts-dialog.glade
- copied, changed from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.glade
trunk/src/empathy-accounts-dialog.h
- copied, changed from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.h
Removed:
trunk/libempathy-gtk/empathy-accounts-dialog.c
trunk/libempathy-gtk/empathy-accounts-dialog.glade
trunk/libempathy-gtk/empathy-accounts-dialog.h
Modified:
trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml
trunk/libempathy-gtk/Makefile.am
trunk/python/pyempathygtk/pyempathygtk.defs
trunk/python/pyempathygtk/pyempathygtk.override
trunk/src/Makefile.am
trunk/src/empathy-accounts.c
trunk/src/empathy-main-window.c
trunk/src/empathy-status-icon.c
Modified: trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml
==============================================================================
--- trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml (original)
+++ trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml Tue Jul 15 13:22:58 2008
@@ -17,7 +17,6 @@
<chapter id="libempathy_api">
<title>libempathy-gtk API reference</title>
<xi:include href="xml/empathy-account-chooser.xml"/>
- <xi:include href="xml/empathy-accounts-dialog.xml"/>
<xi:include href="xml/empathy-account-widget.xml"/>
<xi:include href="xml/empathy-account-widget-irc.xml"/>
<xi:include href="xml/empathy-avatar-chooser.xml"/>
Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am (original)
+++ trunk/libempathy-gtk/Makefile.am Tue Jul 15 13:22:58 2008
@@ -20,7 +20,6 @@
empathy-chat.c \
empathy-irc-network-dialog.c \
empathy-spell-dialog.c \
- empathy-accounts-dialog.c \
empathy-chat-view.c \
empathy-log-window.c \
empathy-theme-boxes.c \
@@ -69,7 +68,6 @@
empathy-chat.h \
empathy-irc-network-dialog.h \
empathy-spell-dialog.h \
- empathy-accounts-dialog.h \
empathy-chat-view.h \
empathy-log-window.h \
empathy-theme-boxes.h \
@@ -108,7 +106,6 @@
empathy-contact-widget.glade \
empathy-contact-dialogs.glade \
empathy-presence-chooser.glade \
- empathy-accounts-dialog.glade \
empathy-account-widget-generic.glade \
empathy-account-widget-jabber.glade \
empathy-account-widget-msn.glade \
Modified: trunk/python/pyempathygtk/pyempathygtk.defs
==============================================================================
--- trunk/python/pyempathygtk/pyempathygtk.defs (original)
+++ trunk/python/pyempathygtk/pyempathygtk.defs Tue Jul 15 13:22:58 2008
@@ -411,19 +411,6 @@
-;; From empathy-accounts-dialog.h
-
-(define-function accounts_dialog_show
- (c-name "empathy_accounts_dialog_show")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWindow*" "parent")
- '("McAccount*" "selected_account")
- )
-)
-
-
-
;; From empathy-chat-view.h
(define-function chat_view_get_type
Modified: trunk/python/pyempathygtk/pyempathygtk.override
==============================================================================
--- trunk/python/pyempathygtk/pyempathygtk.override (original)
+++ trunk/python/pyempathygtk/pyempathygtk.override Tue Jul 15 13:22:58 2008
@@ -3,7 +3,6 @@
#include <Python.h>
#include <pygobject.h>
#include "empathy-account-chooser.h"
-#include "empathy-accounts-dialog.h"
#include "empathy-account-widget.h"
#include "empathy-account-widget-irc.h"
#include "empathy-avatar-chooser.h"
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Jul 15 13:22:58 2008
@@ -31,9 +31,12 @@
empathy-main-window.c empathy-main-window.h \
empathy-preferences.c empathy-preferences.h \
empathy-call-window.c empathy-call-window.h \
- ephy-spinner.c ephy-spinner.h
+ ephy-spinner.c ephy-spinner.h \
+ empathy-accounts-dialog.c empathy-accounts-dialog.h
+
+empathy_accounts_SOURCES = empathy-accounts.c \
+ empathy-accounts-dialog.c empathy-accounts-dialog.h
-empathy_accounts_SOURCES = empathy-accounts.c
empathy_logs_SOURCES = empathy-logs.c
gladedir = $(datadir)/empathy
@@ -44,7 +47,8 @@
empathy-chatrooms-window.glade \
empathy-chat-window.glade \
empathy-new-chatroom-dialog.glade \
- empathy-status-icon.glade
+ empathy-status-icon.glade \
+ empathy-accounts-dialog.glade
dist_man_MANS = \
empathy.1 \
Copied: trunk/src/empathy-accounts-dialog.c (from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.c)
==============================================================================
--- /trunk/libempathy-gtk/empathy-accounts-dialog.c (original)
+++ trunk/src/empathy-accounts-dialog.c Tue Jul 15 13:22:58 2008
@@ -40,12 +40,12 @@
#include <libempathy/empathy-utils.h>
#include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-profile-chooser.h>
+#include <libempathy-gtk/empathy-account-widget.h>
+#include <libempathy-gtk/empathy-account-widget-irc.h>
+#include <libempathy-gtk/empathy-account-widget-sip.h>
#include "empathy-accounts-dialog.h"
-#include "empathy-profile-chooser.h"
-#include "empathy-account-widget.h"
-#include "empathy-account-widget-irc.h"
-#include "empathy-account-widget-sip.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include <libempathy/empathy-debug.h>
@@ -1021,7 +1021,7 @@
dialog = g_new0 (EmpathyAccountsDialog, 1);
filename = empathy_file_lookup ("empathy-accounts-dialog.glade",
- "libempathy-gtk");
+ "src");
glade = empathy_glade_get_file (filename,
"accounts_dialog",
NULL,
Copied: trunk/src/empathy-accounts-dialog.glade (from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.glade)
==============================================================================
Copied: trunk/src/empathy-accounts-dialog.h (from r1232, /trunk/libempathy-gtk/empathy-accounts-dialog.h)
==============================================================================
Modified: trunk/src/empathy-accounts.c
==============================================================================
--- trunk/src/empathy-accounts.c (original)
+++ trunk/src/empathy-accounts.c Tue Jul 15 13:22:58 2008
@@ -29,7 +29,8 @@
#include <gtk/gtk.h>
#include <libempathy/empathy-debug.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
+
+#include "empathy-accounts-dialog.h"
static void
destroy_cb (GtkWidget *dialog,
Modified: trunk/src/empathy-main-window.c
==============================================================================
--- trunk/src/empathy-main-window.c (original)
+++ trunk/src/empathy-main-window.c Tue Jul 15 13:22:58 2008
@@ -44,11 +44,11 @@
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-geometry.h>
#include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
#include <libempathy-gtk/empathy-log-window.h>
#include <libempathy-gtk/empathy-new-message-dialog.h>
#include <libempathy-gtk/empathy-gtk-enum-types.h>
+#include "empathy-accounts-dialog.h"
#include "empathy-main-window.h"
#include "ephy-spinner.h"
#include "empathy-preferences.h"
Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c (original)
+++ trunk/src/empathy-status-icon.c Tue Jul 15 13:22:58 2008
@@ -40,11 +40,11 @@
#include <libempathy-gtk/empathy-presence-chooser.h>
#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-new-message-dialog.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
+#include "empathy-accounts-dialog.h"
#include "empathy-status-icon.h"
#include "empathy-preferences.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]