main_window_balance_update_balance (GtkAction *action,
TpConnection *conn)
{
- TpAccount *account = g_object_get_data (G_OBJECT (action), "account");
+ TpAccount *account = tp_connection_get_account (conn);
GtkWidget *label;
int amount = 0;
guint scale = G_MAXINT32;
g_object_bind_property (account, "icon-name", action, "icon-name",
G_BINDING_SYNC_CREATE);
- g_object_set_data (G_OBJECT (action), "account", account);
g_signal_connect (action, "activate",
G_CALLBACK (main_window_balance_activate_cb), window);
static GtkWidget *
main_window_setup_balance_create_widget (EmpathyMainWindow *window,
- GtkAction *action)
+ GtkAction *action,
+ TpAccount *account)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- TpAccount *account;
GtkWidget *hbox, *image, *label, *button;
- account = g_object_get_data (G_OBJECT (action), "account");
- g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
hbox = gtk_hbox_new (FALSE, 6);
/* protocol icon */
}
static void
-main_window_setup_balance_conn_ready (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
+main_window_setup_balance (EmpathyMainWindow *window,
+ TpAccount *account)
{
- EmpathyMainWindow *window = user_data;
EmpathyMainWindowPriv *priv = GET_PRIV (window);
- TpConnection *conn = TP_CONNECTION (source);
- TpAccount *account = g_object_get_data (source, "account");
+ TpConnection *conn = tp_account_get_connection (account);
GtkAction *action;
- GError *error = NULL;
const gchar *uri;
- if (!tp_proxy_prepare_finish (conn, result, &error)) {
- DEBUG ("Failed to prepare connection: %s", error->message);
-
- g_error_free (error);
+ if (conn == NULL)
return;
- }
if (!tp_proxy_is_prepared (conn, TP_CONNECTION_FEATURE_BALANCE))
return;
gtk_action_set_visible (priv->view_balance_show_in_roster, TRUE);
/* create the display widget */
- main_window_setup_balance_create_widget (window, action);
+ main_window_setup_balance_create_widget (window, action, account);
/* check the current balance and monitor for any changes */
uri = tp_connection_get_balance_uri (conn);
g_signal_connect (conn, "balance-changed",
G_CALLBACK (main_window_balance_changed_cb), action);
-}
-
-static void
-main_window_setup_balance (EmpathyMainWindow *window,
- TpAccount *account)
-{
- TpConnection *conn = tp_account_get_connection (account);
- GQuark features[] = { TP_CONNECTION_FEATURE_BALANCE, 0 };
- if (conn == NULL)
- return;
-
- /* need to prepare the connection:
- * store the account on the connection */
- g_object_set_data (G_OBJECT (conn), "account", account);
- tp_proxy_prepare_async (conn, features,
- main_window_setup_balance_conn_ready, window);
}
static void
"room_join_favorites",
"chat_new_message",
"chat_new_call",
+ "chat_search_contacts",
"chat_add_contact",
"edit_personal_information",
- "edit_blocked_contacts"
+ "edit_blocked_contacts",
+ "edit_search_contacts"
};
for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) {
EmpathyMainWindowPriv *priv = GET_PRIV (window);
GError *error = NULL;
- if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+ if (!tp_proxy_prepare_finish (manager, result, &error)) {
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
return;
{
EmpathyMainWindowPriv *priv;
EmpathyIndividualManager *individual_manager;
- GtkBuilder *gui;
+ GtkBuilder *gui, *gui_mgr;
GtkWidget *sw;
GtkToggleAction *show_offline_widget;
GtkAction *show_map_widget;
gchar *filename;
GSList *l;
GtkTreeModel *model;
+ GtkWidget *search_vbox;
+ GtkWidget *menubar;
priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv);
gtk_window_set_role (GTK_WINDOW (window), "contact_list");
gtk_window_set_default_size (GTK_WINDOW (window), 225, 325);
+ /* don't finalize the widget on delete-event, just hide it */
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
/* Set up interface */
filename = empathy_file_lookup ("empathy-main-window.ui", "src");
gui = empathy_builder_get_file (filename,
"balance_vbox", &priv->balance_vbox,
"errors_vbox", &priv->errors_vbox,
"auth_vbox", &priv->auth_vbox,
+ "search_vbox", &search_vbox,
+ "presence_toolbar", &priv->presence_toolbar,
+ "notebook", &priv->notebook,
+ "no_entry_label", &priv->no_entry_label,
+ "roster_scrolledwindow", &sw,
+ NULL);
+ g_free (filename);
+
+ /* Set UI manager */
+ filename = empathy_file_lookup ("empathy-main-window-menubar.ui", "src");
+ gui_mgr = empathy_builder_get_file (filename,
"ui_manager", &priv->ui_manager,
"view_show_offline", &show_offline_widget,
"view_show_protocols", &priv->show_protocols,
"view_history", &priv->view_history,
"view_show_map", &show_map_widget,
"room_join_favorites", &priv->room_join_favorites,
- "presence_toolbar", &priv->presence_toolbar,
- "notebook", &priv->notebook,
- "no_entry_label", &priv->no_entry_label,
- "roster_scrolledwindow", &sw,
"view_balance_show_in_roster", &priv->view_balance_show_in_roster,
+ "menubar", &menubar,
NULL);
g_free (filename);
+ /* The UI manager is living in its own .ui file as Glade doesn't support
+ * those. The GtkMenubar has to be in this file as well to we manually add
+ * it to the first position of the vbox. */
+ gtk_box_pack_start (GTK_BOX (priv->main_vbox), menubar, FALSE, FALSE, 0);
+ gtk_box_reorder_child (GTK_BOX (priv->main_vbox), menubar, 0);
+
gtk_container_add (GTK_CONTAINER (window), priv->main_vbox);
gtk_widget_show (priv->main_vbox);
g_signal_connect (window, "key-press-event",
G_CALLBACK (main_window_key_press_event_cb), NULL);
- empathy_builder_connect (gui, window,
+ empathy_builder_connect (gui_mgr, window,
"chat_quit", "activate", main_window_chat_quit_cb,
"chat_new_message", "activate", main_window_chat_new_message_cb,
"chat_new_call", "activate", main_window_chat_new_call_cb,
NULL);
/* Set up connection related widgets. */
- main_window_connection_items_setup (window, gui);
+ main_window_connection_items_setup (window, gui_mgr);
g_object_ref (priv->ui_manager);
g_object_unref (gui);
+ g_object_unref (gui_mgr);
#ifndef HAVE_LIBCHAMPLAIN
gtk_action_set_visible (show_map_widget, FALSE);
priv->account_manager = tp_account_manager_dup ();
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
account_manager_prepared_cb, window);
priv->errors = g_hash_table_new_full (g_direct_hash,
/* Set up the throbber */
priv->throbber = gtk_spinner_new ();
gtk_widget_set_size_request (priv->throbber, 16, -1);
- gtk_widget_set_tooltip_text (priv->throbber, _("Show and edit accounts"));
gtk_widget_set_events (priv->throbber, GDK_BUTTON_PRESS_MASK);
g_signal_connect (priv->throbber, "button-press-event",
G_CALLBACK (main_window_throbber_button_press_event_cb),
GTK_WIDGET (priv->individual_view));
empathy_individual_view_set_live_search (priv->individual_view,
EMPATHY_LIVE_SEARCH (priv->search_bar));
- gtk_box_pack_start (GTK_BOX (priv->main_vbox), priv->search_bar,
+ gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar,
FALSE, TRUE, 0);
+
g_signal_connect_swapped (window, "map",
G_CALLBACK (gtk_widget_grab_focus), priv->individual_view);
projects / empathy.git / blobdiff