[empathy/gnome-2-34] Fix set-but-unused warnings
- From: Sjoerd Simons <sjoerds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] Fix set-but-unused warnings
- Date: Sun, 31 Jul 2011 09:41:14 +0000 (UTC)
commit ea7e85117035621697ac2d57e1c1d77531b6a0f1
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Sun Jul 31 10:39:29 2011 +0100
Fix set-but-unused warnings
libempathy-gtk/empathy-account-chooser.c | 10 ----------
libempathy-gtk/empathy-account-widget-irc.c | 6 ------
libempathy-gtk/empathy-avatar-chooser.c | 6 ------
libempathy-gtk/empathy-chat.c | 13 -------------
libempathy-gtk/empathy-contact-list-store.c | 27 ---------------------------
libempathy-gtk/empathy-contact-list-view.c | 11 -----------
libempathy-gtk/empathy-contact-widget.c | 14 --------------
libempathy-gtk/empathy-groups-widget.c | 4 ----
libempathy-gtk/empathy-individual-linker.c | 4 ----
libempathy-gtk/empathy-individual-store.c | 23 -----------------------
libempathy-gtk/empathy-individual-view.c | 12 ------------
libempathy-gtk/empathy-log-window.c | 4 ----
libempathy-gtk/empathy-persona-store.c | 3 ---
libempathy-gtk/empathy-persona-view.c | 12 ------------
libempathy-gtk/empathy-presence-chooser.c | 2 --
libempathy-gtk/empathy-ui-utils.c | 3 +--
libempathy/empathy-auth-factory.c | 2 --
libempathy/empathy-chatroom-manager.c | 9 ---------
libempathy/empathy-chatroom.c | 4 ----
libempathy/empathy-dispatcher.c | 6 ------
libempathy/empathy-ft-handler.c | 3 ---
libempathy/empathy-idle.c | 4 ----
libempathy/empathy-individual-manager.c | 3 ---
libempathy/empathy-irc-network-manager.c | 3 ---
src/empathy-accounts-dialog.c | 20 --------------------
src/empathy-auth-client.c | 3 +--
src/empathy-chat-window.c | 9 ---------
src/empathy-event-manager.c | 10 ----------
src/empathy-ft-manager.c | 3 ---
src/empathy-new-chatroom-dialog.c | 7 -------
src/empathy-preferences.c | 6 +-----
src/empathy-sidebar.c | 2 --
tests/interactive/contact-manager.c | 2 --
33 files changed, 3 insertions(+), 247 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index b7eebe5..aeaaf43 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -252,10 +252,6 @@ account_chooser_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyAccountChooserPriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id) {
case PROP_HAS_ALL_OPTION:
empathy_account_chooser_set_has_all_option (EMPATHY_ACCOUNT_CHOOSER (object),
@@ -321,15 +317,12 @@ empathy_account_chooser_has_all_selected (EmpathyAccountChooser *chooser)
TpAccount *
empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)
{
- EmpathyAccountChooserPriv *priv;
TpAccount *account;
GtkTreeModel *model;
GtkTreeIter iter;
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
- priv = GET_PRIV (chooser);
-
model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser), &iter)) {
return NULL;
@@ -354,14 +347,11 @@ empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)
TpConnection *
empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
{
- EmpathyAccountChooserPriv *priv;
TpAccount *account;
TpConnection *connection;
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
- priv = GET_PRIV (chooser);
-
account = empathy_account_chooser_dup_account (chooser);
/* if the returned account is NULL, then the account manager probably
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3f34279..c8a401f 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -59,9 +59,6 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
{
const gchar *nick = NULL;
const gchar *fullname = NULL;
- gint port = 6667;
- const gchar *charset;
- gboolean ssl = FALSE;
EmpathyAccountSettings *ac_settings;
g_object_get (settings->self, "settings", &ac_settings, NULL);
@@ -69,9 +66,6 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
nick = empathy_account_settings_get_string (ac_settings, "account");
fullname = empathy_account_settings_get_string (ac_settings,
"fullname");
- charset = empathy_account_settings_get_string (ac_settings, "charset");
- port = empathy_account_settings_get_uint32 (ac_settings, "port");
- ssl = empathy_account_settings_get_boolean (ac_settings, "use-ssl");
if (!nick)
{
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 678e7b9..13a1239 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -720,11 +720,8 @@ avatar_chooser_drag_motion_cb (GtkWidget *widget,
guint time_,
EmpathyAvatarChooser *chooser)
{
- EmpathyAvatarChooserPriv *priv;
GList *p;
- priv = GET_PRIV (chooser);
-
for (p = gdk_drag_context_list_targets (context); p != NULL;
p = p->next) {
gchar *possible_type;
@@ -760,11 +757,8 @@ avatar_chooser_drag_drop_cb (GtkWidget *widget,
guint time_,
EmpathyAvatarChooser *chooser)
{
- EmpathyAvatarChooserPriv *priv;
GList *p;
- priv = GET_PRIV (chooser);
-
if (gdk_drag_context_list_targets (context) == NULL) {
return FALSE;
}
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index e6eca09..8e4c97a 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -273,13 +273,10 @@ chat_new_connection_cb (TpAccount *account,
EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- TpConnection *connection;
if (new_status != TP_CONNECTION_STATUS_CONNECTED)
return;
- connection = tp_account_get_connection (account);
-
if (priv->tp_chat != NULL || account != priv->account ||
priv->handle_type == TP_HANDLE_TYPE_NONE ||
EMP_STR_EMPTY (priv->id))
@@ -720,9 +717,6 @@ chat_command_join (EmpathyChat *chat,
while (rooms[i] != NULL) {
/* ignore empty strings */
if (!EMP_STR_EMPTY (rooms[i])) {
- TpConnection *connection;
-
- connection = empathy_tp_chat_get_connection (priv->tp_chat);
empathy_dispatcher_join_muc (priv->account, rooms[i],
gtk_get_current_event_time ());
}
@@ -1041,13 +1035,10 @@ chat_send (EmpathyChat *chat,
static void
chat_input_text_view_send (EmpathyChat *chat)
{
- EmpathyChatPriv *priv;
GtkTextBuffer *buffer;
GtkTextIter start, end;
gchar *msg;
- priv = GET_PRIV (chat);
-
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -1822,7 +1813,6 @@ chat_input_populate_popup_cb (GtkTextView *view,
GtkMenu *menu,
EmpathyChat *chat)
{
- EmpathyChatPriv *priv;
GtkTextBuffer *buffer;
GtkTextTagTable *table;
GtkTextTag *tag;
@@ -1836,7 +1826,6 @@ chat_input_populate_popup_cb (GtkTextView *view,
GtkWidget *smiley_menu;
GtkWidget *image;
- priv = GET_PRIV (chat);
buffer = gtk_text_view_get_buffer (view);
/* Add the emoticon menu. */
@@ -3034,7 +3023,6 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
EmpathyTpChat *tp_chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- TpConnection *connection;
GPtrArray *properties;
g_return_if_fail (EMPATHY_IS_CHAT (chat));
@@ -3050,7 +3038,6 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
}
priv->tp_chat = g_object_ref (tp_chat);
- connection = empathy_tp_chat_get_connection (priv->tp_chat);
priv->account = g_object_ref (empathy_tp_chat_get_account (priv->tp_chat));
g_signal_connect (tp_chat, "destroy",
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index d87461e..07e3f19 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -411,10 +411,6 @@ contact_list_store_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id) {
case PROP_CONTACT_LIST:
contact_list_store_set_contact_list (EMPATHY_CONTACT_LIST_STORE (object),
@@ -890,10 +886,6 @@ contact_list_store_members_changed_cb (EmpathyContactList *list_iface,
gboolean is_member,
EmpathyContactListStore *store)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (store);
-
DEBUG ("Contact %s (%d) %s",
empathy_contact_get_id (contact),
empathy_contact_get_handle (contact),
@@ -912,10 +904,6 @@ contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
gboolean is_favourite,
EmpathyContactListStore *store)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (store);
-
DEBUG ("Contact %s (%d) is %s a favourite",
empathy_contact_get_id (contact),
empathy_contact_get_handle (contact),
@@ -933,10 +921,6 @@ contact_list_store_member_renamed_cb (EmpathyContactList *list_iface,
gchar *message,
EmpathyContactListStore *store)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (store);
-
DEBUG ("Contact %s (%d) renamed to %s (%d)",
empathy_contact_get_id (old_contact),
empathy_contact_get_handle (old_contact),
@@ -1082,12 +1066,9 @@ static void
contact_list_store_remove_contact (EmpathyContactListStore *store,
EmpathyContact *contact)
{
- EmpathyContactListStorePriv *priv;
GtkTreeModel *model;
GList *iters, *l;
- priv = GET_PRIV (store);
-
iters = contact_list_store_find_contact (store, contact);
if (!iters) {
return;
@@ -1292,11 +1273,9 @@ contact_list_store_contact_set_active (EmpathyContactListStore *store,
gboolean active,
gboolean set_changed)
{
- EmpathyContactListStorePriv *priv;
GtkTreeModel *model;
GList *iters, *l;
- priv = GET_PRIV (store);
model = GTK_TREE_MODEL (store);
iters = contact_list_store_find_contact (store, contact);
@@ -1415,14 +1394,11 @@ contact_list_store_get_group (EmpathyContactListStore *store,
gboolean *created,
gboolean is_fake_group)
{
- EmpathyContactListStorePriv *priv;
GtkTreeModel *model;
GtkTreeIter iter_group;
GtkTreeIter iter_separator;
FindGroup fg;
- priv = GET_PRIV (store);
-
memset (&fg, 0, sizeof (fg));
fg.name = name;
@@ -1736,13 +1712,10 @@ static GList *
contact_list_store_find_contact (EmpathyContactListStore *store,
EmpathyContact *contact)
{
- EmpathyContactListStorePriv *priv;
GtkTreeModel *model;
GList *l = NULL;
FindContact fc;
- priv = GET_PRIV (store);
-
memset (&fc, 0, sizeof (fc));
fc.contact = contact;
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index bda1ed8..37113a1 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -393,7 +393,6 @@ contact_list_view_contact_drag_received (GtkWidget *view,
const gchar *contact_id = NULL;
gchar *new_group = NULL;
gchar *old_group = NULL;
- gboolean success = TRUE;
gboolean new_group_is_fake, old_group_is_fake = TRUE;
priv = GET_PRIV (view);
@@ -437,7 +436,6 @@ contact_list_view_contact_drag_received (GtkWidget *view,
if (!connection) {
DEBUG ("Failed to get connection for account '%s'", account_id);
- success = FALSE;
g_free (new_group);
g_free (old_group);
g_object_unref (account_manager);
@@ -1861,7 +1859,6 @@ empathy_contact_list_view_new (EmpathyContactListStore *store,
EmpathyContact *
empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
{
- EmpathyContactListViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -1869,8 +1866,6 @@ empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
return NULL;
@@ -1886,7 +1881,6 @@ empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
EmpathyContactListFlags
empathy_contact_list_view_get_flags (EmpathyContactListView *view)
{
- EmpathyContactListViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -1894,8 +1888,6 @@ empathy_contact_list_view_get_flags (EmpathyContactListView *view)
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), 0);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
return 0;
@@ -1912,7 +1904,6 @@ gchar *
empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
gboolean *is_fake_group)
{
- EmpathyContactListViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -1922,8 +1913,6 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
return NULL;
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 61e0456..d4e0a20 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -665,8 +665,6 @@ contact_widget_location_update (EmpathyContactWidget *information)
{
GHashTable *location;
GValue *value;
- gdouble lat = 0.0, lon = 0.0;
- gboolean has_position = TRUE;
GtkWidget *label;
guint row = 0;
static const gchar* ordered_geolocation_keys[] = {
@@ -700,18 +698,6 @@ contact_widget_location_update (EmpathyContactWidget *information)
return;
}
- value = g_hash_table_lookup (location, EMPATHY_LOCATION_LAT);
- if (value == NULL)
- has_position = FALSE;
- else
- lat = g_value_get_double (value);
-
- value = g_hash_table_lookup (location, EMPATHY_LOCATION_LON);
- if (value == NULL)
- has_position = FALSE;
- else
- lon = g_value_get_double (value);
-
value = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP);
if (value == NULL)
{
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 45a9056..94255dd 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -467,10 +467,6 @@ set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyGroupsWidgetPriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id)
{
case PROP_GROUP_DETAILS:
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 8da4569..741088a 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -526,10 +526,6 @@ set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyIndividualLinkerPriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id)
{
case PROP_START_INDIVIDUAL:
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 1b4b4fd..a47d83b 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -214,14 +214,11 @@ individual_store_get_group (EmpathyIndividualStore *self,
gboolean *created,
gboolean is_fake_group)
{
- EmpathyIndividualStorePriv *priv;
GtkTreeModel *model;
GtkTreeIter iter_group;
GtkTreeIter iter_separator;
FindGroup fg;
- priv = GET_PRIV (self);
-
memset (&fg, 0, sizeof (fg));
fg.name = name;
@@ -305,13 +302,10 @@ static GList *
individual_store_find_contact (EmpathyIndividualStore *self,
FolksIndividual *individual)
{
- EmpathyIndividualStorePriv *priv;
GtkTreeModel *model;
GList *l = NULL;
FindContact fc;
- priv = GET_PRIV (self);
-
memset (&fc, 0, sizeof (fc));
fc.individual = individual;
@@ -337,12 +331,9 @@ static void
individual_store_remove_individual (EmpathyIndividualStore *self,
FolksIndividual *individual)
{
- EmpathyIndividualStorePriv *priv;
GtkTreeModel *model;
GList *iters, *l;
- priv = GET_PRIV (self);
-
iters = individual_store_find_contact (self, individual);
if (iters == NULL)
return;
@@ -471,11 +462,9 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
gboolean active,
gboolean set_changed)
{
- EmpathyIndividualStorePriv *priv;
GtkTreeModel *model;
GList *iters, *l;
- priv = GET_PRIV (self);
model = GTK_TREE_MODEL (self);
iters = individual_store_find_contact (self, individual);
@@ -956,10 +945,6 @@ individual_store_favourites_changed_cb (EmpathyIndividualManager *manager,
gboolean is_favourite,
EmpathyIndividualStore *self)
{
- EmpathyIndividualStorePriv *priv;
-
- priv = GET_PRIV (self);
-
DEBUG ("Individual %s is %s a favourite",
folks_individual_get_id (individual),
is_favourite ? "now" : "no longer");
@@ -1051,10 +1036,6 @@ individual_store_member_renamed_cb (EmpathyIndividualManager *manager,
const gchar *message,
EmpathyIndividualStore *self)
{
- EmpathyIndividualStorePriv *priv;
-
- priv = GET_PRIV (self);
-
DEBUG ("Individual %s renamed to %s",
folks_individual_get_id (old_individual),
folks_individual_get_id (new_individual));
@@ -1158,10 +1139,6 @@ individual_store_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyIndividualStorePriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id)
{
case PROP_INDIVIDUAL_MANAGER:
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 98c7f96..4672f48 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -402,7 +402,6 @@ individual_view_persona_drag_received (GtkWidget *self,
GtkTreePath *path,
GtkSelectionData *selection)
{
- EmpathyIndividualViewPriv *priv;
EmpathyIndividualManager *manager = NULL;
FolksIndividual *individual = NULL;
FolksPersona *persona = NULL;
@@ -410,8 +409,6 @@ individual_view_persona_drag_received (GtkWidget *self,
GList *individuals, *l;
gboolean retval = FALSE;
- priv = GET_PRIV (self);
-
persona_uid = (const gchar *) gtk_selection_data_get_data (selection);
/* FIXME: This is slow, but the only way to find the Persona we're having
@@ -2153,7 +2150,6 @@ empathy_individual_view_new (EmpathyIndividualStore *store,
FolksIndividual *
empathy_individual_view_dup_selected (EmpathyIndividualView *view)
{
- EmpathyIndividualViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -2161,8 +2157,6 @@ empathy_individual_view_dup_selected (EmpathyIndividualView *view)
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return NULL;
@@ -2176,7 +2170,6 @@ empathy_individual_view_dup_selected (EmpathyIndividualView *view)
EmpathyIndividualManagerFlags
empathy_individual_view_get_flags (EmpathyIndividualView *view)
{
- EmpathyIndividualViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -2184,8 +2177,6 @@ empathy_individual_view_get_flags (EmpathyIndividualView *view)
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), 0);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return 0;
@@ -2200,7 +2191,6 @@ gchar *
empathy_individual_view_get_selected_group (EmpathyIndividualView *view,
gboolean *is_fake_group)
{
- EmpathyIndividualViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -2210,8 +2200,6 @@ empathy_individual_view_get_selected_group (EmpathyIndividualView *view,
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
- priv = GET_PRIV (view);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return NULL;
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index f6b5edf..95310f3 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -157,7 +157,6 @@ account_manager_prepared_cb (GObject *source_object,
{
TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
EmpathyLogWindow *window = user_data;
- guint account_num;
GList *accounts;
GError *error = NULL;
@@ -171,7 +170,6 @@ account_manager_prepared_cb (GObject *source_object,
}
accounts = tp_account_manager_get_valid_accounts (account_manager);
- account_num = g_list_length (accounts);
g_list_free (accounts);
gtk_widget_show_all (window->hbox_chats);
@@ -583,12 +581,10 @@ log_window_find_populate (EmpathyLogWindow *window,
{
GtkTreeView *view;
GtkTreeModel *model;
- GtkTreeSelection *selection;
GtkListStore *store;
view = GTK_TREE_VIEW (window->treeview_find);
model = gtk_tree_view_get_model (view);
- selection = gtk_tree_view_get_selection (view);
store = GTK_LIST_STORE (model);
empathy_chat_view_clear (window->chatview_find);
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c
index 060898b..3b955bd 100644
--- a/libempathy-gtk/empathy-persona-store.c
+++ b/libempathy-gtk/empathy-persona-store.c
@@ -186,12 +186,9 @@ persona_set_active (EmpathyPersonaStore *self,
gboolean active,
gboolean set_changed)
{
- EmpathyPersonaStorePriv *priv;
GtkTreePath *path;
GtkTreeIter iter;
- priv = GET_PRIV (self);
-
path = find_persona (self, persona);
if (path == NULL)
return;
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
index ff2c6ec..053a138 100644
--- a/libempathy-gtk/empathy-persona-view.c
+++ b/libempathy-gtk/empathy-persona-view.c
@@ -354,14 +354,11 @@ individual_drag_received (EmpathyPersonaView *self,
GdkDragContext *context,
GtkSelectionData *selection)
{
- EmpathyPersonaViewPriv *priv;
EmpathyIndividualManager *manager = NULL;
FolksIndividual *individual;
const gchar *individual_id;
gboolean success = FALSE;
- priv = GET_PRIV (self);
-
individual_id = (const gchar *) gtk_selection_data_get_data (selection);
manager = empathy_individual_manager_dup_singleton ();
individual = empathy_individual_manager_lookup_member (manager,
@@ -410,13 +407,10 @@ drag_motion (GtkWidget *widget,
guint time_)
{
EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
- EmpathyPersonaViewPriv *priv;
GdkAtom target;
guint i;
DndDragType drag_type = DND_DRAG_TYPE_UNKNOWN;
- priv = GET_PRIV (self);
-
target = gtk_drag_dest_find_target (GTK_WIDGET (self), context, NULL);
/* Determine the DndDragType of the data */
@@ -464,15 +458,12 @@ drag_data_get (GtkWidget *widget,
guint time_)
{
EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
- EmpathyPersonaViewPriv *priv;
FolksPersona *persona;
const gchar *persona_uid;
if (info != DND_DRAG_TYPE_PERSONA_ID)
return;
- priv = GET_PRIV (self);
-
persona = empathy_persona_view_dup_selected (self);
if (persona == NULL)
return;
@@ -789,7 +780,6 @@ empathy_persona_view_new (EmpathyPersonaStore *store,
FolksPersona *
empathy_persona_view_dup_selected (EmpathyPersonaView *self)
{
- EmpathyPersonaViewPriv *priv;
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -797,8 +787,6 @@ empathy_persona_view_dup_selected (EmpathyPersonaView *self)
g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), NULL);
- priv = GET_PRIV (self);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return NULL;
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cd9b455..f29e5be 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -480,11 +480,9 @@ presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
mc_set_custom_state (self);
}
else {
- PresenceChooserEntryType type;
TpConnectionPresenceType state;
char *status;
- type = presence_chooser_get_entry_type (self);
state = get_state_and_status (self, &status);
if (!empathy_status_presets_is_valid (state)) {
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 06cec24..a347a59 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -407,11 +407,10 @@ empathy_avatar_pixbuf_roundify (GdkPixbuf *pixbuf)
static gboolean
empathy_gdk_pixbuf_is_opaque (GdkPixbuf *pixbuf)
{
- gint width, height, rowstride, i;
+ gint height, rowstride, i;
guchar *pixels;
guchar *row;
- width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
pixels = gdk_pixbuf_get_pixels (pixbuf);
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 8602226..2692181 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -96,10 +96,8 @@ server_tls_handler_ready_cb (GObject *source,
{
EmpathyServerTLSHandler *handler;
GError *error = NULL;
- EmpathyAuthFactoryPriv *priv;
HandlerContextData *data = user_data;
- priv = GET_PRIV (data->self);
handler = empathy_server_tls_handler_new_finish (res, &error);
if (error != NULL)
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 115e415..042cae2 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -266,14 +266,11 @@ static gboolean
chatroom_manager_file_parse (EmpathyChatroomManager *manager,
const gchar *filename)
{
- EmpathyChatroomManagerPriv *priv;
xmlParserCtxtPtr ctxt;
xmlDocPtr doc;
xmlNodePtr chatrooms;
xmlNodePtr node;
- priv = GET_PRIV (manager);
-
DEBUG ("Attempting to parse file:'%s'...", filename);
ctxt = xmlNewParserCtxt ();
@@ -302,8 +299,6 @@ chatroom_manager_file_parse (EmpathyChatroomManager *manager,
}
}
- DEBUG ("Parsed %d chatrooms", g_list_length (priv->chatrooms));
-
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
@@ -542,13 +537,9 @@ gboolean
empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
EmpathyChatroom *chatroom)
{
- EmpathyChatroomManagerPriv *priv;
-
g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
- priv = GET_PRIV (manager);
-
/* don't add more than once */
if (!empathy_chatroom_manager_find (manager,
empathy_chatroom_get_account (chatroom),
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5e3784a..7e06076 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -273,10 +273,6 @@ chatroom_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyChatroomPriv *priv;
-
- priv = GET_PRIV (object);
-
switch (param_id) {
case PROP_ACCOUNT:
empathy_chatroom_set_account (EMPATHY_CHATROOM (object),
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 2a009b3..bc467ff 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -279,7 +279,6 @@ dispatcher_constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *retval;
- EmpathyDispatcherPriv *priv;
if (dispatcher != NULL)
return g_object_ref (dispatcher);
@@ -290,8 +289,6 @@ dispatcher_constructor (GType type,
dispatcher = EMPATHY_DISPATCHER (retval);
g_object_add_weak_pointer (retval, (gpointer) &dispatcher);
- priv = GET_PRIV (dispatcher);
-
return retval;
}
@@ -788,7 +785,6 @@ empathy_dispatcher_find_requestable_channel_classes
{
va_list var_args;
GArray *properties;
- EmpathyDispatcherPriv *priv;
GList *retval;
guint idx;
char *str;
@@ -797,8 +793,6 @@ empathy_dispatcher_find_requestable_channel_classes
g_return_val_if_fail (TP_IS_CONNECTION (connection), NULL);
g_return_val_if_fail (channel_type != NULL, NULL);
- priv = GET_PRIV (self);
-
va_start (var_args, first_property_name);
properties = setup_varargs (var_args, channel_type, first_property_name);
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 94b9cf3..fe87d9c 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -894,11 +894,8 @@ do_hash_job (GIOSchedulerJob *job,
{
HashingData *hash_data = user_data;
gssize bytes_read;
- EmpathyFTHandlerPriv *priv;
GError *error = NULL;
- priv = GET_PRIV (hash_data->handler);
-
again:
if (hash_data->buffer == NULL)
hash_data->buffer = g_malloc0 (BUFFER_SIZE);
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 12686da..da1c4a5 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -360,10 +360,8 @@ idle_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- EmpathyIdlePriv *priv;
EmpathyIdle *idle;
- priv = GET_PRIV (object);
idle = EMPATHY_IDLE (object);
switch (param_id) {
@@ -388,10 +386,8 @@ idle_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyIdlePriv *priv;
EmpathyIdle *idle;
- priv = GET_PRIV (object);
idle = EMPATHY_IDLE (object);
switch (param_id) {
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index fd0125f..d73f593 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -516,13 +516,10 @@ gboolean
empathy_individual_manager_supports_blocking (EmpathyIndividualManager *self,
FolksIndividual *individual)
{
- EmpathyIndividualManagerPriv *priv;
GList *personas, *l;
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self), FALSE);
- priv = GET_PRIV (self);
-
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 691c05d..6d7ff1c 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -617,14 +617,11 @@ irc_network_manager_file_parse (EmpathyIrcNetworkManager *self,
const gchar *filename,
gboolean user_defined)
{
- EmpathyIrcNetworkManagerPriv *priv;
xmlParserCtxtPtr ctxt;
xmlDocPtr doc;
xmlNodePtr networks;
xmlNodePtr node;
- priv = GET_PRIV (self);
-
DEBUG ("Attempting to parse file:'%s'...", filename);
ctxt = xmlNewParserCtxt ();
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 3c690c0..fec4551 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1270,12 +1270,10 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkTreeView *view;
- GtkTreeModel *model;
GtkTreeSelection *selection;
GtkTreeIter iter;
view = GTK_TREE_VIEW (priv->treeview);
- model = gtk_tree_view_get_model (view);
selection = gtk_tree_view_get_selection (view);
if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
return;
@@ -1552,14 +1550,12 @@ accounts_dialog_get_settings_iter (EmpathyAccountsDialog *dialog,
GtkTreeIter *iter)
{
GtkTreeView *view;
- GtkTreeSelection *selection;
GtkTreeModel *model;
gboolean ok;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
/* Update the status in the model */
view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
model = gtk_tree_view_get_model (view);
for (ok = gtk_tree_model_get_iter_first (model, iter);
@@ -1589,14 +1585,12 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
GtkTreeIter *iter)
{
GtkTreeView *view;
- GtkTreeSelection *selection;
GtkTreeModel *model;
gboolean ok;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
/* Update the status in the model */
view = GTK_TREE_VIEW (priv->treeview);
- selection = gtk_tree_view_get_selection (view);
model = gtk_tree_view_get_model (view);
for (ok = gtk_tree_model_get_iter_first (model, iter);
@@ -1646,11 +1640,8 @@ static void
accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
{
- GtkTreeSelection *selection;
GtkTreeIter iter;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
select_and_scroll_to_iter (dialog, &iter);
}
@@ -1797,14 +1788,12 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
GtkTreeIter iter;
TpConnectionStatus status;
const gchar *name;
- gboolean enabled;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
gboolean selected = FALSE;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
status = tp_account_get_connection_status (account, NULL);
name = tp_account_get_display_name (account);
- enabled = tp_account_is_enabled (account);
settings = empathy_account_settings_new_for_account (account);
@@ -1934,12 +1923,6 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog,
TpAccount *account,
gboolean enabled)
{
- GtkTreeModel *model;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
- /* Update the status in the model */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
-
/* Update the status-infobar in the details view */
accounts_dialog_update_status_infobar (dialog, account);
@@ -2002,11 +1985,8 @@ static void
accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
TpAccount *account)
{
- GtkTreeSelection *selection;
GtkTreeIter iter;
- EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (accounts_dialog_get_account_iter (dialog, account, &iter))
select_and_scroll_to_iter (dialog, &iter);
}
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 2a1e425..2748305 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -156,7 +156,6 @@ verifier_verify_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
{
- gboolean res;
EmpTLSCertificateRejectReason reason;
GError *error = NULL;
EmpathyTLSCertificate *certificate = NULL;
@@ -166,7 +165,7 @@ verifier_verify_cb (GObject *source,
"certificate", &certificate,
NULL);
- res = empathy_tls_verifier_verify_finish (EMPATHY_TLS_VERIFIER (source),
+ empathy_tls_verifier_verify_finish (EMPATHY_TLS_VERIFIER (source),
result, &reason, &details, &error);
if (error != NULL)
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 149c0b8..c06cc3b 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -236,7 +236,6 @@ chat_window_create_label (EmpathyChatWindow *window,
EmpathyChat *chat,
gboolean is_tab_label)
{
- EmpathyChatWindowPriv *priv;
GtkWidget *hbox;
GtkWidget *name_label;
GtkWidget *status_image;
@@ -247,8 +246,6 @@ chat_window_create_label (EmpathyChatWindow *window,
PangoAttrList *attr_list;
PangoAttribute *attr;
- priv = GET_PRIV (window);
-
/* The spacing between the button and the label. */
hbox = gtk_hbox_new (FALSE, 0);
@@ -1079,7 +1076,6 @@ chat_window_tabs_next_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
- EmpathyChat *chat;
gint index_, numPages;
gboolean wrap_around;
@@ -1088,7 +1084,6 @@ chat_window_tabs_next_activate_cb (GtkAction *action,
g_object_get (gtk_settings_get_default (), "gtk-keynav-wrap-around",
&wrap_around, NULL);
- chat = priv->current_chat;
index_ = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
numPages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
@@ -1105,7 +1100,6 @@ chat_window_tabs_previous_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
- EmpathyChat *chat;
gint index_, numPages;
gboolean wrap_around;
@@ -1114,7 +1108,6 @@ chat_window_tabs_previous_activate_cb (GtkAction *action,
g_object_get (gtk_settings_get_default (), "gtk-keynav-wrap-around",
&wrap_around, NULL);
- chat = priv->current_chat;
index_ = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
numPages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
@@ -2121,12 +2114,10 @@ empathy_chat_window_get_default (gboolean room)
}
for (l = chat_windows; l; l = l->next) {
- EmpathyChatWindowPriv *priv;
EmpathyChatWindow *chat_window;
GtkWidget *dialog;
chat_window = l->data;
- priv = GET_PRIV (chat_window);
dialog = empathy_chat_window_get_dialog (chat_window);
if (empathy_window_get_is_visible (GTK_WINDOW (dialog))) {
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 041d22a..5e5f2ab 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -339,9 +339,6 @@ static void
event_text_channel_process_func (EventPriv *event)
{
EmpathyTpChat *tp_chat;
- gint64 timestamp;
-
- timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ());
if (event->approval->handler != 0)
{
@@ -608,7 +605,6 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat,
EmpathyContact *sender;
const gchar *header;
const gchar *msg;
- TpChannel *channel;
EventPriv *event;
/* try to update the event if it's referring to a chat which is already in the
@@ -619,8 +615,6 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat,
header = empathy_contact_get_alias (sender);
msg = empathy_message_get_body (message);
- channel = empathy_tp_chat_get_channel (tp_chat);
-
if (event != NULL)
event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header,
msg);
@@ -809,13 +803,9 @@ invite_dialog_response_cb (GtkDialog *dialog,
gint response,
EventManagerApproval *approval)
{
- EmpathyTpChat *tp_chat;
-
gtk_widget_destroy (GTK_WIDGET (approval->dialog));
approval->dialog = NULL;
- tp_chat = EMPATHY_TP_CHAT (approval->handler_instance);
-
if (response != GTK_RESPONSE_OK)
{
/* close channel */
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 6b9e537..f73a8ab 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -695,11 +695,8 @@ static void
ft_manager_start_transfer (EmpathyFTManager *manager,
EmpathyFTHandler *handler)
{
- EmpathyFTManagerPriv *priv;
gboolean is_outgoing;
- priv = GET_PRIV (manager);
-
is_outgoing = !empathy_ft_handler_is_incoming (handler);
DEBUG ("Start transfer, is outgoing %s",
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 6cf45ad..7b8f3d5 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -481,11 +481,8 @@ out:
static void
new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
{
- EmpathyAccountChooser *account_chooser;
const gchar *protocol;
- account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
-
if (dialog->account == NULL)
return;
@@ -635,8 +632,6 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist *room_list,
EmpathyChatroom *chatroom,
EmpathyNewChatroomDialog *dialog)
{
- GtkTreeView *view;
- GtkTreeSelection *selection;
GtkListStore *store;
GtkTreeIter iter;
gchar *members;
@@ -650,8 +645,6 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist *room_list,
empathy_chatroom_get_room (chatroom));
/* Add to model */
- view = GTK_TREE_VIEW (dialog->treeview);
- selection = gtk_tree_view_get_selection (view);
store = GTK_LIST_STORE (dialog->model);
members = g_strdup_printf ("%d", empathy_chatroom_get_members_count (chatroom));
tmp = g_strdup_printf ("<b>%s</b>", empathy_chatroom_get_name (chatroom));
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 89133ed..d22a886 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -311,7 +311,7 @@ preferences_sound_cell_toggled_cb (GtkCellRendererToggle *toggle,
{
EmpathyPreferencesPriv *priv = GET_PRIV (preferences);
GtkTreePath *path;
- gboolean toggled, instore;
+ gboolean instore;
GtkTreeIter iter;
GtkTreeView *view;
GtkTreeModel *model;
@@ -321,7 +321,6 @@ preferences_sound_cell_toggled_cb (GtkCellRendererToggle *toggle,
model = gtk_tree_view_get_model (view);
path = gtk_tree_path_new_from_string (path_string);
- toggled = gtk_cell_renderer_toggle_get_active (toggle);
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_model_get (model, &iter, COL_SOUND_KEY, &key,
@@ -410,7 +409,6 @@ preferences_languages_setup (EmpathyPreferences *preferences)
GtkTreeView *view;
GtkListStore *store;
GtkTreeSelection *selection;
- GtkTreeModel *model;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
guint col_offset;
@@ -427,8 +425,6 @@ preferences_languages_setup (EmpathyPreferences *preferences)
selection = gtk_tree_view_get_selection (view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- model = GTK_TREE_MODEL (store);
-
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled",
G_CALLBACK (preferences_languages_cell_toggled_cb),
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index 8c97921..e936358 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -196,11 +196,9 @@ static void
empathy_sidebar_class_init (EmpathySidebarClass *empathy_sidebar_class)
{
GObjectClass *g_object_class;
- GtkWidgetClass *widget_class;
GtkObjectClass *gtk_object_klass;
g_object_class = G_OBJECT_CLASS (empathy_sidebar_class);
- widget_class = GTK_WIDGET_CLASS (empathy_sidebar_class);
gtk_object_klass = GTK_OBJECT_CLASS (empathy_sidebar_class);
g_type_class_add_private (g_object_class, sizeof (EmpathySidebarPrivate));
diff --git a/tests/interactive/contact-manager.c b/tests/interactive/contact-manager.c
index 7793b44..1b50bde 100644
--- a/tests/interactive/contact-manager.c
+++ b/tests/interactive/contact-manager.c
@@ -12,7 +12,6 @@ int
main (int argc, char **argv)
{
EmpathyContactManager *manager;
- GMainLoop *main_loop;
EmpathyContactListStore *store;
GtkWidget *combo;
GtkWidget *window;
@@ -22,7 +21,6 @@ main (int argc, char **argv)
empathy_gtk_init ();
empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
- main_loop = g_main_loop_new (NULL, FALSE);
manager = empathy_contact_manager_dup_singleton ();
store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (manager));
empathy_contact_list_store_set_is_compact (store, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
