diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-06-04 02:45:53 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-06-04 02:45:53 +0800 |
| commit | ec7481901727606b0ce05f1dc2088c34f9e18b5f (patch) | |
| tree | 97a0e0f147278845b1f06b26cb70d76177d05af0 /src/empathy-main.c | |
| parent | f76a92f31b0d8212526fe8dd8c89dc1399812072 (diff) | |
| download | gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar.gz gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar.bz2 gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar.lz gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar.xz gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.tar.zst gsoc2013-empathy-ec7481901727606b0ce05f1dc2088c34f9e18b5f.zip | |
libempathy-gtk/gossip-ui-utils.c libempathy-gtk/gossip-accounts-dialog.c
2007-06-03 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-ui-utils.c
* libempathy-gtk/gossip-accounts-dialog.c
* libempathy-gtk/Makefile.am
* src/empathy-accounts-main.c
* src/empathy-chat-main.c
* src/Makefile.am
* src/empathy-main.c
* libempathy/gossip-utils.c
* libempathy/Makefile.am
* src/empathy-filter.h
* src/empathy-filter-plugin.c
* src/empathy-filter.xml
* src/empathy-filter.c
* libempathy/gossip-paths.c
* libempathy/gossip-paths.h: Remove unused code.
svn path=/trunk/; revision=120
Diffstat (limited to 'src/empathy-main.c')
| -rw-r--r-- | src/empathy-main.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/empathy-main.c b/src/empathy-main.c index a49611123..f64b2d6e9 100644 --- a/src/empathy-main.c +++ b/src/empathy-main.c @@ -38,12 +38,9 @@ #include <libempathy/gossip-debug.h> #include <libempathy/gossip-utils.h> #include <libempathy/gossip-presence.h> -#include <libempathy/gossip-paths.h> #include <libempathy-gtk/empathy-main-window.h> #include <libempathy-gtk/empathy-status-icon.h> -#include "empathy-filter.h" - #define DEBUG_DOMAIN "EmpathyMain" static void error_cb (MissionControl *mc, @@ -115,18 +112,6 @@ start_mission_control (MissionControl *mc) NULL); } -static void -new_channel_cb (EmpathyFilter *filter, - TpConn *tp_conn, - TpChan *tp_chan, - guint context_handle, - gpointer user_data) -{ - gossip_debug (DEBUG_DOMAIN, "Filtering context handle: %d", - context_handle); - empathy_filter_process (filter, context_handle, TRUE); -} - int main (int argc, char *argv[]) { @@ -134,8 +119,6 @@ main (int argc, char *argv[]) GtkWidget *window; MissionControl *mc; McAccountMonitor *monitor; - EmpathyFilter *filter; - gchar *localedir; GnomeProgram *program; gboolean no_connect = FALSE; GOptionContext *context; @@ -146,11 +129,9 @@ main (int argc, char *argv[]) NULL }, }; - localedir = gossip_paths_get_locale_path (); - bindtextdomain (GETTEXT_PACKAGE, localedir); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - g_free (localedir); context = g_option_context_new (_("- Empathy Instant Messenger")); g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); @@ -167,12 +148,8 @@ main (int argc, char *argv[]) NULL); gtk_window_set_default_icon_name ("empathy"); - - /* Setting up channel filter */ - filter = empathy_filter_new (); - g_signal_connect (filter, "new-channel", - G_CALLBACK (new_channel_cb), - NULL); + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + DATADIR G_DIR_SEPARATOR_S "empathy"); /* Setting up MC */ monitor = mc_account_monitor_new (); |