From dc20e1130bfb44b2595df2b46042381103e75c51 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 1 Aug 2008 16:03:42 +0000 Subject: Remove empathy-accounts binary, it is replaced by empathy --accounts svn path=/trunk/; revision=1283 --- src/Makefile.am | 7 +----- src/empathy-accounts.1 | 12 --------- src/empathy-accounts.c | 67 -------------------------------------------------- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 src/empathy-accounts.1 delete mode 100644 src/empathy-accounts.c (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index d6dbc522a..239635355 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,6 @@ LDADD = \ bin_PROGRAMS = \ empathy \ - empathy-accounts \ empathy-logs empathy_SOURCES = \ @@ -35,9 +34,6 @@ empathy_SOURCES = \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ empathy-event-manager.c empathy-event-manager.h -empathy_accounts_SOURCES = empathy-accounts.c \ - empathy-accounts-dialog.c empathy-accounts-dialog.h - empathy_logs_SOURCES = empathy-logs.c gladedir = $(datadir)/empathy @@ -52,8 +48,7 @@ glade_DATA = \ empathy-accounts-dialog.glade dist_man_MANS = \ - empathy.1 \ - empathy-accounts.1 + empathy.1 EXTRA_DIST = \ $(autostart_DATA) \ diff --git a/src/empathy-accounts.1 b/src/empathy-accounts.1 deleted file mode 100644 index b615e875e..000000000 --- a/src/empathy-accounts.1 +++ /dev/null @@ -1,12 +0,0 @@ -.TH EMPATHY-ACCOUNTS "1" "October 2007" "Telepathy project" "User Commands" -.SH NAME -empathy\-accounts \- configure Telepathy instant messaging accounts -.SH SYNOPSIS -empathy\-accounts -.SH DESCRIPTION -empathy-accounts displays a graphical (Gtk+) dialog where the instant messaging -accounts used by Empathy (via Telepathy Mission Control) can be configured. -.SH OPTIONS -There are no command-line options. -.SH SEE ALSO -\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c deleted file mode 100644 index 4e75b9ab5..000000000 --- a/src/empathy-accounts.c +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: Xavier Claessens - */ - -#include - -#include -#include - -#include -#include - -#include - -#include "empathy-accounts-dialog.h" - -static void -destroy_cb (GtkWidget *dialog, - gpointer user_data) -{ - gtk_main_quit (); -} - -int -main (int argc, char *argv[]) -{ - GtkWidget *dialog; - - gtk_init (&argc, &argv); - - if (g_getenv ("EMPATHY_TIMING") != NULL) { - g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL); - } - empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG")); - tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE")); - - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - PKGDATADIR G_DIR_SEPARATOR_S "icons"); - dialog = empathy_accounts_dialog_show (NULL, NULL); - - g_signal_connect (dialog, "destroy", - G_CALLBACK (destroy_cb), - NULL); - - gtk_main (); - - return EXIT_SUCCESS; -} - -- cgit v1.2.3