#include <string.h>
#include <sys/stat.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-protocol.h>
#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-irc-network-manager.h>
#include "empathy-irc-network-dialog.h"
#include "empathy-account-widget-irc.h"
#include "empathy-ui-utils.h"
-#define DEBUG_DOMAIN "AccountWidgetIRC"
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
+#include <libempathy/empathy-debug.h>
#define IRC_NETWORKS_FILENAME "irc-networks.xml"
GtkWidget *vbox_settings;
GtkWidget *combobox_network;
- GtkWidget *button_add_network;
- GtkWidget *button_network;
- GtkWidget *button_remove;
} EmpathyAccountWidgetIrc;
enum {
static void
unset_server_params (EmpathyAccountWidgetIrc *settings)
{
- empathy_debug (DEBUG_DOMAIN, "Unset server, port and use-ssl");
+ DEBUG ("Unset server, port and use-ssl");
mc_account_unset_param (settings->account, "server");
mc_account_unset_param (settings->account, "port");
mc_account_unset_param (settings->account, "use-ssl");
g_assert (network != NULL);
g_object_get (network, "charset", &charset, NULL);
- empathy_debug (DEBUG_DOMAIN, "Setting charset to %s", charset);
+ DEBUG ("Setting charset to %s", charset);
mc_account_set_param_string (settings->account, "charset", charset);
g_free (charset);
"ssl", &ssl,
NULL);
- empathy_debug (DEBUG_DOMAIN, "Setting server to %s", address);
+ DEBUG ("Setting server to %s", address);
mc_account_set_param_string (settings->account, "server", address);
- empathy_debug (DEBUG_DOMAIN, "Setting port to %u", port);
+ DEBUG ("Setting port to %u", port);
mc_account_set_param_int (settings->account, "port", port);
- empathy_debug (DEBUG_DOMAIN, "Setting use-ssl to %s",
- ssl ? "TRUE": "FALSE" );
+ DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" );
mc_account_set_param_boolean (settings->account, "use-ssl", ssl);
g_free (address);
g_assert (network != NULL);
g_object_get (network, "name", &name, NULL);
- empathy_debug (DEBUG_DOMAIN, "Remove network %s", name);
+ DEBUG ("Remove network %s", name);
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
empathy_irc_network_manager_remove (settings->network_manager, network);
g_object_set (network, "charset", charset, NULL);
g_object_get (network, "name", &name, NULL);
- empathy_debug (DEBUG_DOMAIN, "Account use network %s", name);
+ DEBUG ("Account use network %s", name);
g_free (name);
}
EmpathyIrcServer *srv;
GtkTreeIter iter;
- empathy_debug (DEBUG_DOMAIN, "Create a network %s", server);
+ DEBUG ("Create a network %s", server);
network = empathy_irc_network_new (server);
srv = empathy_irc_server_new (server, port, ssl);
{
EmpathyAccountWidgetIrc *settings;
gchar *dir, *user_file_with_path, *global_file_with_path;
- GladeXML *glade;
+ GtkBuilder *gui;
GtkListStore *store;
GtkCellRenderer *renderer;
+ gchar *filename;
settings = g_slice_new0 (EmpathyAccountWidgetIrc);
settings->account = g_object_ref (account);
g_free (global_file_with_path);
g_free (user_file_with_path);
- glade = empathy_glade_get_file ("empathy-account-widget-irc.glade",
- "vbox_irc_settings",
- NULL,
+ filename = empathy_file_lookup ("empathy-account-widget-irc.ui",
+ "libempathy-gtk");
+ gui = empathy_builder_get_file (filename,
"vbox_irc_settings", &settings->vbox_settings,
"combobox_network", &settings->combobox_network,
- "button_network", &settings->button_network,
- "button_add_network", &settings->button_add_network,
- "button_remove", &settings->button_remove,
NULL);
+ g_free (filename);
/* Fill the networks combobox */
store = gtk_list_store_new (2, G_TYPE_OBJECT, G_TYPE_STRING);
account_widget_irc_setup (settings);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_nick", "account",
"entry_fullname", "fullname",
"entry_password", "password",
"entry_quit_message", "quit-message",
NULL);
- empathy_glade_connect (glade, settings,
+ empathy_builder_connect (gui, settings,
"vbox_irc_settings", "destroy", account_widget_irc_destroy_cb,
"button_network", "clicked", account_widget_irc_button_edit_network_clicked_cb,
"button_add_network", "clicked", account_widget_irc_button_add_network_clicked_cb,
- "button_remove", "clicked", account_widget_irc_button_remove_clicked_cb,
+ "button_remove_network", "clicked", account_widget_irc_button_remove_clicked_cb,
"combobox_network", "changed", account_widget_irc_combobox_network_changed_cb,
NULL);
- g_object_unref (glade);
-
- return settings->vbox_settings;
+ return empathy_builder_unref_and_keep_widget (gui, settings->vbox_settings);
}