{
EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ DEBUG ("%p", manager);
+
/* remove all the completed/cancelled/errored transfers */
ft_manager_clear (manager);
/* There is still FTs on flight, just hide the window */
DEBUG ("Hiding window");
gtk_widget_hide (widget);
- return TRUE;
+ return TRUE;
}
return FALSE;
ft_manager_destroy_cb (GtkWidget *widget,
EmpathyFTManager *manager)
{
+ DEBUG ("%p", manager);
+
g_object_unref (manager);
}
{
EmpathyFTManagerPriv *priv = GET_PRIV (object);
- DEBUG ("%p", object);
+ DEBUG ("FT Manager %p", object);
g_hash_table_destroy (priv->ft_handler_to_row_ref);
if (manager_singleton)
{
- retval = g_object_ref (manager_singleton);
+ retval = G_OBJECT (manager_singleton);
}
else
{
/* public methods */
-/**
- * empathy_ft_manager_dup_singleton:
- *
- * Returns a reference to the #EmpathyFTManager singleton object.
- *
- * Returns: a #EmpathyFTManager
- */
-EmpathyFTManager *
-empathy_ft_manager_dup_singleton (void)
-{
- return g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
-}
-
void
-empathy_ft_manager_add_handler (EmpathyFTManager *manager,
- EmpathyFTHandler *handler)
+empathy_ft_manager_add_handler (EmpathyFTHandler *handler)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
DEBUG ("Adding handler");
- g_return_if_fail (EMPATHY_IS_FT_MANAGER (manager));
g_return_if_fail (EMPATHY_IS_FT_HANDLER (handler));
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
+
ft_manager_add_handler_to_list (manager, handler, NULL);
gtk_window_present (GTK_WINDOW (priv->window));
}
void
-empathy_ft_manager_display_error (EmpathyFTManager *manager,
- EmpathyFTHandler *handler,
+empathy_ft_manager_display_error (EmpathyFTHandler *handler,
const GError *error)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
- g_return_if_fail (EMPATHY_IS_FT_MANAGER (manager));
g_return_if_fail (EMPATHY_IS_FT_HANDLER (handler));
g_return_if_fail (error != NULL);
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
+
ft_manager_add_handler_to_list (manager, handler, error);
gtk_window_present (GTK_WINDOW (priv->window));
}
void
-empathy_ft_manager_show (EmpathyFTManager *manager)
+empathy_ft_manager_show (void)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
- g_return_if_fail (EMPATHY_IS_FT_MANAGER (manager));
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
gtk_window_present (GTK_WINDOW (priv->window));
}
GType empathy_ft_manager_get_type (void);
/* public methods */
-EmpathyFTManager *empathy_ft_manager_dup_singleton (void);
-void empathy_ft_manager_add_handler (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler);
-void empathy_ft_manager_display_error (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler, const GError *error);
-void empathy_ft_manager_show (EmpathyFTManager *manager);
+void empathy_ft_manager_add_handler (EmpathyFTHandler *handler);
+void empathy_ft_manager_display_error (EmpathyFTHandler *handler,
+ const GError *error);
+void empathy_ft_manager_show (void);
G_END_DECLS
EmpathyFTHandler *handler,
gpointer user_data)
{
- EmpathyFTManager *ft_manager;
-
- ft_manager = empathy_ft_manager_dup_singleton ();
- empathy_ft_manager_add_handler (ft_manager, handler);
+ empathy_ft_manager_add_handler (handler);
g_object_unref (handler);
}
EmpathyDispatcher *dispatcher;
EmpathyLogManager *log_manager;
EmpathyChatroomManager *chatroom_manager;
- EmpathyFTManager *ft_manager;
EmpathyCallFactory *call_factory;
EmpathyFTFactory *ft_factory;
GtkWidget *window;
chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
- ft_manager = empathy_ft_manager_dup_singleton ();
-
notify_init (_(PACKAGE_NAME));
/* Create the call factory */
call_factory = empathy_call_factory_initialise ();