#include <libmissioncontrol/mc-account-monitor.h>
#include <libmissioncontrol/mission-control.h>
-#include <libempathy/empathy-session.h>
#include <libempathy/gossip-debug.h>
+#include <libempathy/gossip-presence.h>
#include <libempathy-gtk/empathy-main-window.h>
-#include <libempathy-gtk/gossip-stock.h>
+#include <libempathy-gtk/empathy-status-icon.h>
#include <libempathy-gtk/gossip-accounts-dialog.h>
-#define DEBUG_DOMAIN "Empathy"
-
-static void error_cb (MissionControl *mc,
- GError *error,
- gpointer data);
-static void service_ended_cb (MissionControl *mc,
- gpointer user_data);
-static void start_mission_control (MissionControl *mc);
-static void destroy_cb (GtkWidget *window,
- gpointer user_data);
-static void icon_activate_cb (GtkStatusIcon *status_icon,
- GtkWidget *window);
+#include "empathy-filter.h"
+
+#define DEBUG_DOMAIN "EmpathyMain"
+
+static void error_cb (MissionControl *mc,
+ GError *error,
+ gpointer data);
+static void service_ended_cb (MissionControl *mc,
+ gpointer user_data);
+static void operation_error_cb (MissionControl *mc,
+ guint operation_id,
+ guint error_code,
+ gpointer user_data);
+static void start_mission_control (MissionControl *mc);
+static void destroy_cb (GtkWidget *window,
+ MissionControl *mc);
+static void icon_activate_cb (EmpathyStatusIcon *icon,
+ GtkWidget *window);
static void
error_cb (MissionControl *mc,
gossip_debug (DEBUG_DOMAIN, "Mission Control stopped");
}
+static void
+operation_error_cb (MissionControl *mc,
+ guint operation_id,
+ guint error_code,
+ gpointer user_data)
+{
+ gossip_debug (DEBUG_DOMAIN, "Error code %d during operation %d",
+ error_code,
+ operation_id);
+}
+
static void
account_enabled_cb (McAccountMonitor *monitor,
gchar *unique_name,
presence = mission_control_get_presence_actual (mc, NULL);
- if (presence != MC_PRESENCE_UNSET &&
- presence != MC_PRESENCE_OFFLINE) {
+ if (presence > MC_PRESENCE_OFFLINE) {
/* MC is already running and online, nothing to do */
return;
}
gossip_debug (DEBUG_DOMAIN, "Starting Mission Control...");
- /* FIXME: Save/Restore status message */
- mission_control_set_presence (mc, MC_PRESENCE_AVAILABLE,
+ mission_control_set_presence (mc,
+ MC_PRESENCE_AVAILABLE,
NULL,
(McCallback) error_cb,
NULL);
-
- mission_control_connect_all_with_default_presence (mc,
- (McCallback) error_cb,
- NULL);
}
static void
-destroy_cb (GtkWidget *window,
- gpointer user_data)
+destroy_cb (GtkWidget *window,
+ MissionControl *mc)
{
- gossip_stock_finalize ();
- empathy_session_finalize ();
+ mission_control_set_presence (mc,
+ MC_PRESENCE_OFFLINE,
+ NULL, NULL, NULL);
+
gtk_main_quit ();
}
static void
-icon_activate_cb (GtkStatusIcon *status_icon,
- GtkWidget *window)
+icon_activate_cb (EmpathyStatusIcon *icon,
+ GtkWidget *window)
{
if (GTK_WIDGET_VISIBLE (window)) {
gtk_widget_hide (window);
}
}
+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[])
{
- GList *accounts;
- GtkStatusIcon *icon;
- GtkWidget *window;
- MissionControl *mc;
- McAccountMonitor *monitor;
+ GList *accounts;
+ EmpathyStatusIcon *icon;
+ GtkWidget *window;
+ MissionControl *mc;
+ McAccountMonitor *monitor;
+ EmpathyFilter *filter;
gtk_init (&argc, &argv);
- /* FIXME: This is a horrible hack */
- gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+ /* Setting up channel filter */
+ filter = empathy_filter_new ();
+ g_signal_connect (filter, "new-channel",
+ G_CALLBACK (new_channel_cb),
+ NULL);
+
+ /* Setting up MC */
+ monitor = mc_account_monitor_new ();
+ mc = mission_control_new (tp_get_bus ());
+ g_signal_connect (monitor, "account-enabled",
+ G_CALLBACK (account_enabled_cb),
+ mc);
+ g_signal_connect (mc, "ServiceEnded",
+ G_CALLBACK (service_ended_cb),
+ NULL);
+ g_signal_connect (mc, "Error",
+ G_CALLBACK (operation_error_cb),
+ NULL);
+ start_mission_control (mc);
/* Setting up the main window */
window = empathy_main_window_show ();
g_signal_connect (window, "destroy",
G_CALLBACK (destroy_cb),
- NULL);
+ mc);
g_signal_connect (window, "delete-event",
G_CALLBACK (gtk_widget_hide_on_delete),
NULL);
- /* Setting up the tray icon */
- icon = gtk_status_icon_new_from_stock (GOSSIP_STOCK_AVAILABLE);
- gtk_status_icon_set_tooltip (icon, "Empathy - click here to show/hide the main window");
- gtk_status_icon_set_visible (icon, TRUE);
+ /* Setting up the status icon */
+ icon = empathy_status_icon_new ();
g_signal_connect (icon, "activate",
G_CALLBACK (icon_activate_cb),
window);
gossip_accounts_dialog_show ();
}
- /* Setting up MC */
- monitor = mc_account_monitor_new ();
- mc = mission_control_new (tp_get_bus ());
- g_signal_connect (monitor, "account-enabled",
- G_CALLBACK (account_enabled_cb),
- mc);
- g_signal_connect (mc, "ServiceEnded",
- G_CALLBACK (service_ended_cb),
- NULL);
- start_mission_control (mc);
-
gtk_main ();
g_object_unref (monitor);
projects / empathy.git / blobdiff