#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-ui-utils.h"
#include "empathy-irc-network-dialog.h"
-#define DEBUG_DOMAIN "AccountWidgetIRC"
-
typedef struct {
EmpathyIrcNetwork *network;
GtkWidget *parent)
{
static EmpathyIrcNetworkDialog *dialog = NULL;
- GladeXML *glade;
+ GtkBuilder *gui;
GtkListStore *store;
GtkCellRenderer *renderer;
GtkAdjustment *adjustment;
GtkTreeSelection *selection;
GtkTreeViewColumn *column;
+ gchar *filename;
g_return_val_if_fail (network != NULL, NULL);
dialog->network = network;
g_object_ref (dialog->network);
- glade = empathy_glade_get_file ("empathy-account-widget-irc.glade",
- "irc_network_dialog",
- NULL,
+ filename = empathy_file_lookup ("empathy-account-widget-irc.ui",
+ "libempathy-gtk");
+ gui = empathy_builder_get_file (filename,
"irc_network_dialog", &dialog->dialog,
"button_close", &dialog->button_close,
"entry_network", &dialog->entry_network,
"button_up", &dialog->button_up,
"button_down", &dialog->button_down,
NULL);
+ g_free (filename);
store = gtk_list_store_new (4, G_TYPE_OBJECT, G_TYPE_STRING,
G_TYPE_UINT, G_TYPE_BOOLEAN);
irc_network_dialog_setup (dialog);
- empathy_glade_connect (glade, dialog,
+ empathy_builder_connect (gui, dialog,
"irc_network_dialog", "destroy", irc_network_dialog_destroy_cb,
"button_close", "clicked", irc_network_dialog_close_clicked_cb,
"entry_network", "focus-out-event", irc_network_dialog_network_focus_cb,
"combobox_charset", "changed", irc_network_dialog_combobox_charset_changed_cb,
NULL);
- g_object_unref (glade);
+ g_object_unref (gui);
g_object_add_weak_pointer (G_OBJECT (dialog->dialog),
(gpointer) &dialog);
gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
irc_network_dialog_network_update_buttons (dialog);
+ gtk_widget_show_all (dialog->dialog);
return dialog->dialog;
}