aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Tellier <jonathan.tellier@gmail.com>2009-08-27 23:57:18 +0800
committerjtellier <jonathan.tellier@collabora.co.uk>2009-08-29 02:27:43 +0800
commit1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b (patch)
tree1412cdb2f2db9eb49c714cf7ee5b02f399fe5aec
parent435a811e440c3a5a79f504fa6f2850e63673f49a (diff)
downloadgsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar.gz
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar.bz2
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar.lz
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar.xz
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.tar.zst
gsoc2013-empathy-1855aa4b32cc4bf06f9dd748b5c1a24c25129f0b.zip
Minor changes to EmpathyAccountWidget and EmpathyAccountsDialog
- account_widget_entry_changed_common is not called when an entry loses focus. Since this function is called on every keystroke, it was unnecessary to call it again on focus-out-event. - The EmpathyAccountWidget's control buttons' sensitivity (and contains_pending_changes member) is not altered when the state of the "Enabled" checkbox is changed due to an event which was not initiated by the user. - Fixed capitalization error in a comment in empathy-accounts-dialog.c
-rw-r--r--libempathy-gtk/empathy-account-widget.c19
-rw-r--r--src/empathy-accounts-dialog.c2
2 files changed, 4 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 684ff4c9c..df0dc967b 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -151,16 +151,6 @@ account_widget_entry_changed_common (EmpathyAccountWidget *self,
}
}
-static gboolean
-account_widget_entry_focus_cb (GtkWidget *widget,
- GdkEventFocus *event,
- EmpathyAccountWidget *self)
-{
- account_widget_entry_changed_common (self, GTK_ENTRY (widget), TRUE);
-
- return FALSE;
-}
-
static void
account_widget_entry_changed_cb (GtkEditable *entry,
EmpathyAccountWidget *self)
@@ -356,9 +346,6 @@ account_widget_setup_widget (EmpathyAccountWidget *self,
gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
}
- g_signal_connect (widget, "focus-out-event",
- G_CALLBACK (account_widget_entry_focus_cb),
- self);
g_signal_connect (widget, "changed",
G_CALLBACK (account_widget_entry_changed_cb), self);
}
@@ -1045,7 +1032,7 @@ empathy_account_widget_enabled_cb (EmpathyAccount *account,
}
static void
-account_widget_enabled_toggled_cb (GtkToggleButton *toggle_button,
+account_widget_enabled_released_cb (GtkToggleButton *toggle_button,
gpointer user_data)
{
account_widget_handle_control_buttons_sensitivity (
@@ -1256,8 +1243,8 @@ do_constructed (GObject *obj)
gtk_widget_show (priv->enabled_checkbox);
- g_signal_connect (G_OBJECT (priv->enabled_checkbox), "toggled",
- G_CALLBACK (account_widget_enabled_toggled_cb), self);
+ g_signal_connect (G_OBJECT (priv->enabled_checkbox), "released",
+ G_CALLBACK (account_widget_enabled_released_cb), self);
}
/* hook up to widget destruction to unref ourselves */
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index b146396c9..08d6d224e 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -88,7 +88,7 @@ typedef struct {
GtkWidget *settings_widget;
/* We have to keep a reference on the actual EmpathyAccountWidget, not just
- * his GtkWidget. it is the only reliable source we can query to know if
+ * his GtkWidget. It is the only reliable source we can query to know if
* there are any unsaved changes to the currently selected account. We can't
* look at the account settings because it does not contain everything that
* can be changed using the EmpathyAccountWidget. For instance, it does not