PROP_NETWORK
};
+enum {
+ RESPONSE_RESET = 0
+};
+
typedef struct {
EmpathyAccountSettings *settings;
EmpathyIrcNetwork *network;
GtkWidget *select_button;
gulong search_sig;
+ gulong activate_sig;
} EmpathyIrcNetworkChooserDialogPriv;
enum {
GtkTreeModel *model;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+ if (selection == NULL)
+ return NULL;
+
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return NULL;
network = dup_selected_network (self, NULL);
if (network == priv->network)
{
- g_object_unref (network);
+ g_clear_object (&network);
return;
}
filter_iter = iter_to_filter_iter (self, &iter);
scroll_to_iter (self, &filter_iter);
+ gtk_widget_grab_focus (priv->treeview);
+
g_object_unref (network);
}
{
GtkWidget *dialog;
- dialog = empathy_irc_network_dialog_show (network, NULL);
+ dialog = empathy_irc_network_dialog_show (network, GTK_WIDGET (self));
g_signal_connect (dialog, "destroy",
G_CALLBACK (irc_network_dialog_destroy_cb), self);
EmpathyIrcNetwork *network;
GtkTreeIter iter;
- gtk_widget_hide (priv->search);
-
network = dup_selected_network (self, &iter);
if (network == NULL)
return;
- DEBUG ("Remove network %s", empathy_irc_network_get_name (network));
+ /* Hide the search after picking the network to get the right one */
+ gtk_widget_hide (priv->search);
- gtk_list_store_remove (priv->store, &iter);
- empathy_irc_network_manager_remove (priv->network_manager, network);
+ DEBUG ("Remove network %s", empathy_irc_network_get_name (network));
- /* Select next network */
- if (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store), &iter))
+ /* Delete network and select next network */
+ if (gtk_list_store_remove (priv->store, &iter))
{
GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
select_iter (self, &filter_iter, TRUE);
}
+ else
+ {
+ /* this should only happen if the last network was deleted */
+ GtkTreeIter last, filter_iter;
+ gint n_elements;
+
+ n_elements = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->store),
+ NULL);
+
+ if (n_elements > 0)
+ {
+ gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (priv->store), &last,
+ NULL, (n_elements-1));
+ filter_iter = iter_to_filter_iter (self, &last);
+
+ select_iter (self, &filter_iter, TRUE);
+ }
+ }
+
+ empathy_irc_network_manager_remove (priv->network_manager, network);
+ gtk_widget_grab_focus (priv->treeview);
g_object_unref (network);
}
+static void
+reset_networks (EmpathyIrcNetworkChooserDialog *self)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+ GSList *networks, *l;
+
+ networks = empathy_irc_network_manager_get_dropped_networks (
+ priv->network_manager);
+
+ for (l = networks; l != NULL; l = g_slist_next (l))
+ {
+ EmpathyIrcNetwork *network;
+ GtkTreeIter iter;
+
+ network = EMPATHY_IRC_NETWORK (l->data);
+ empathy_irc_network_activate (network);
+
+ gtk_list_store_insert_with_values (priv->store, &iter, -1,
+ COL_NETWORK_OBJ, network,
+ COL_NETWORK_NAME, empathy_irc_network_get_name (network),
+ -1);
+ }
+
+ g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
+}
+
static void
dialog_response_cb (GtkDialog *dialog,
gint response,
edit_network (self);
else if (response == GTK_RESPONSE_REJECT)
remove_network (self);
+ else if (response == RESPONSE_RESET)
+ reset_networks (self);
}
static gboolean
return visible;
}
+static void
+search_activate_cb (GtkWidget *search,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ gtk_widget_hide (search);
+ gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE);
+}
static void
search_text_notify_cb (EmpathyLiveSearch *search,
gtk_tree_model_filter_refilter (priv->filter);
- /* Select first matching network */
+ /* Is there at least one network in the view ? */
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->filter),
&filter_iter))
{
- select_iter (self, &filter_iter, TRUE);
+ const gchar *text;
+
+ text = empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search));
+ if (!EMP_STR_EMPTY (text))
+ {
+ /* We are doing a search, select the first matching network */
+ select_iter (self, &filter_iter, TRUE);
+ }
+ else
+ {
+ /* Search has been cancelled. Scroll to the selected network */
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (priv->treeview));
+
+ if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter))
+ scroll_to_iter (self, &filter_iter);
+ }
+
sensitive = TRUE;
}
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
g_signal_handler_disconnect (priv->search, priv->search_sig);
+ g_signal_handler_disconnect (priv->search, priv->activate_sig);
}
static void
priv->search_sig = g_signal_connect (priv->search, "notify::text",
G_CALLBACK (search_text_notify_cb), self);
+ priv->activate_sig = g_signal_connect (priv->search, "activate",
+ G_CALLBACK (search_activate_cb), self);
+
/* Add buttons */
gtk_dialog_add_buttons (dialog,
GTK_STOCK_ADD, GTK_RESPONSE_OK,
GTK_STOCK_EDIT, GTK_RESPONSE_APPLY,
GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT,
+ _("Reset _Networks List"), RESPONSE_RESET,
NULL);
- priv->select_button = gtk_dialog_add_button (dialog, _("Select"),
+ priv->select_button = gtk_dialog_add_button (dialog,
+ C_("verb displayed on a button to select an IRC network", "Select"),
GTK_RESPONSE_CLOSE);
fill_store (self);
/* Request a side ensuring to display at least some networks */
gtk_widget_set_size_request (GTK_WIDGET (self), -1, 300);
+
+ gtk_window_set_modal (GTK_WINDOW (self), TRUE);
}
static void
GtkWidget *
empathy_irc_network_chooser_dialog_new (EmpathyAccountSettings *settings,
- EmpathyIrcNetwork *network)
+ EmpathyIrcNetwork *network,
+ GtkWindow *parent)
{
return g_object_new (EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG,
"settings", settings,
"network", network,
+ "transient-for", parent,
NULL);
}
projects / empathy.git / blobdiff