[empathy] Renamed empathy_contact_list_view_get_selected to empathy_contact_list_view_dup_selected and fixed l
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy] Renamed empathy_contact_list_view_get_selected to empathy_contact_list_view_dup_selected and fixed l
- Date: Wed, 22 Apr 2009 07:45:32 -0400 (EDT)
commit 10a93b8c864c38dacc49a9f33b7ebf0cff549cfb
Author: Jonny Lamb <jonny lamb collabora co uk>
Date: Wed Apr 22 12:07:29 2009 +0100
Renamed empathy_contact_list_view_get_selected to empathy_contact_list_view_dup_selected and fixed leaks.
Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>
---
libempathy-gtk/empathy-contact-list-view.c | 8 ++++----
libempathy-gtk/empathy-contact-list-view.h | 2 +-
megaphone/src/megaphone-applet.c | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index df7149b..ca224f5 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -474,7 +474,7 @@ contact_list_view_drag_data_get (GtkWidget *widget,
gtk_tree_path_free (src_path);
- contact = empathy_contact_list_view_get_selected (EMPATHY_CONTACT_LIST_VIEW (widget));
+ contact = empathy_contact_list_view_dup_selected (EMPATHY_CONTACT_LIST_VIEW (widget));
if (!contact) {
return;
}
@@ -1218,7 +1218,7 @@ empathy_contact_list_view_new (EmpathyContactListStore *store,
}
EmpathyContact *
-empathy_contact_list_view_get_selected (EmpathyContactListView *view)
+empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
{
EmpathyContactListViewPriv *priv;
GtkTreeSelection *selection;
@@ -1384,7 +1384,7 @@ contact_list_view_remove_activate_cb (GtkMenuItem *menuitem,
EmpathyContactListViewPriv *priv = GET_PRIV (view);
EmpathyContact *contact;
- contact = empathy_contact_list_view_get_selected (view);
+ contact = empathy_contact_list_view_dup_selected (view);
if (contact) {
gchar *text;
@@ -1417,7 +1417,7 @@ empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view)
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
- contact = empathy_contact_list_view_get_selected (view);
+ contact = empathy_contact_list_view_dup_selected (view);
if (!contact) {
return NULL;
}
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 82990d6..bb6766c 100644
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -70,7 +70,7 @@ GType empathy_contact_list_view_get_type (void) G
EmpathyContactListView * empathy_contact_list_view_new (EmpathyContactListStore *store,
EmpathyContactListFeatureFlags list_features,
EmpathyContactFeatureFlags contact_features);
-EmpathyContact * empathy_contact_list_view_get_selected (EmpathyContactListView *view);
+EmpathyContact * empathy_contact_list_view_dup_selected (EmpathyContactListView *view);
gchar * empathy_contact_list_view_get_selected_group (EmpathyContactListView *view);
GtkWidget * empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view);
GtkWidget * empathy_contact_list_view_get_group_menu (EmpathyContactListView *view);
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index b58255f..0879e75 100644
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -221,7 +221,7 @@ megaphone_applet_preferences_response_cb (GtkWidget *dialog,
/* Retrieve the selected contact, if any and set it up in gconf.
* GConf will notify us from the change and we will adjust ourselves */
contact_list = g_object_get_data (G_OBJECT (dialog), "contact-list");
- contact = empathy_contact_list_view_get_selected (contact_list);
+ contact = empathy_contact_list_view_dup_selected (contact_list);
if (contact) {
McAccount *account;
const gchar *account_id;
@@ -240,6 +240,7 @@ megaphone_applet_preferences_response_cb (GtkWidget *dialog,
"contact_id", str,
NULL);
g_free (str);
+ g_object_unref (contact);
}
}
gtk_widget_destroy (dialog);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]