Commit 38bb6de5 authored by Tristan Matthews's avatar Tristan Matthews

Merge branch 'master' into show_addrbook

parents f18fc5ee 35e43a82
......@@ -46,7 +46,6 @@ libsflphone_client_la_SOURCES = \
conference_obj.h \
shortcuts.h \
logger.h \
unused.h \
str_utils.h \
seekslider.h \
account_schema.h \
......
......@@ -36,7 +36,6 @@
#include "account_schema.h"
#include "logger.h"
#include "actions.h"
#include "unused.h"
static GQueue * accountQueue;
......@@ -180,7 +179,7 @@ const gchar * account_state_name(account_state_t s)
}
}
void account_list_free_elm(gpointer elm, gpointer data UNUSED)
void account_list_free_elm(gpointer elm, G_GNUC_UNUSED gpointer data)
{
account_t *a = elm;
g_free(a->accountID);
......
......@@ -64,7 +64,6 @@
#include "contacts/addrbookfactory.h"
#include "icons/icon_factory.h"
#include "statusicon.h"
#include "unused.h"
#include "sliders.h"
#include "messaging/message_tab.h"
#include "history_loader.h"
......
......@@ -33,7 +33,6 @@
#endif
#include "codeclist.h"
#include "unused.h"
#include "logger.h"
#include <string.h>
#include <stdlib.h>
......@@ -100,7 +99,7 @@ static gboolean codecs_audio_load(void)
}
static void
codec_free(gpointer data, gpointer user_data UNUSED)
codec_free(gpointer data, G_GNUC_UNUSED gpointer user_data)
{
codec_t *codec = (codec_t*) data;
g_free(codec->name);
......
......@@ -56,7 +56,6 @@
#include "tlsadvanceddialog.h"
#include "dbus/dbus.h"
#include "utils.h"
#include "unused.h"
/**
* TODO: tidy this up
......@@ -137,7 +136,7 @@ auto_answer_cb(GtkToggleButton *widget, account_t *account)
/*
* Display / Hide the password
*/
static void show_password_cb(GtkWidget *widget UNUSED, gpointer data)
static void show_password_cb(G_GNUC_UNUSED GtkWidget *widget, gpointer data)
{
gtk_entry_set_visibility(GTK_ENTRY(data), !gtk_entry_get_visibility(GTK_ENTRY(data)));
}
......@@ -203,7 +202,7 @@ static GPtrArray* get_new_credential(void)
return credential_array;
}
static void update_credential_cb(GtkWidget *widget, gpointer data UNUSED)
static void update_credential_cb(GtkWidget *widget, G_GNUC_UNUSED gpointer data)
{
GtkTreeIter iter;
......@@ -425,7 +424,7 @@ static void select_credential_cb(GtkTreeSelection *selection, GtkTreeModel *mode
}
}
static void add_credential_cb(GtkWidget *button UNUSED, gpointer data)
static void add_credential_cb(G_GNUC_UNUSED GtkWidget *button, gpointer data)
{
GtkTreeModel *model = (GtkTreeModel *) data;
......@@ -438,7 +437,7 @@ static void add_credential_cb(GtkWidget *button UNUSED, gpointer data)
}
static void
delete_credential_cb(GtkWidget *button UNUSED, gpointer data)
delete_credential_cb(G_GNUC_UNUSED GtkWidget *button, gpointer data)
{
GtkTreeIter iter;
GtkTreeView *treeview = (GtkTreeView *) data;
......@@ -476,8 +475,8 @@ cell_edited_cb(GtkCellRendererText *renderer, gchar *path_desc, gchar *text,
}
static void
editing_started_cb(GtkCellRenderer *cell UNUSED, GtkCellEditable * editable,
const gchar * path, gpointer data UNUSED)
editing_started_cb(G_GNUC_UNUSED GtkCellRenderer *cell, GtkCellEditable * editable,
const gchar * path, G_GNUC_UNUSED gpointer data)
{
DEBUG("path desc: %s\n", path);
......@@ -486,7 +485,7 @@ editing_started_cb(GtkCellRenderer *cell UNUSED, GtkCellEditable * editable,
gtk_entry_set_text(GTK_ENTRY(editable), gtk_entry_get_text(GTK_ENTRY(entry_password)));
}
static void show_advanced_zrtp_options_cb(GtkWidget *widget UNUSED, OptionsData *data)
static void show_advanced_zrtp_options_cb(G_GNUC_UNUSED GtkWidget *widget, OptionsData *data)
{
gchar *proto = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(key_exchange_combo));
......@@ -500,13 +499,13 @@ static void show_advanced_zrtp_options_cb(GtkWidget *widget UNUSED, OptionsData
static void
show_advanced_tls_options_cb(GtkWidget *widget UNUSED, OptionsData *data)
show_advanced_tls_options_cb(G_GNUC_UNUSED GtkWidget *widget, OptionsData *data)
{
show_advanced_tls_options(data->account, data->client);
}
static void
key_exchange_changed_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
key_exchange_changed_cb(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED gpointer data)
{
gchar *active_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(key_exchange_combo));
DEBUG("Key exchange changed %s", active_text);
......@@ -592,7 +591,7 @@ get_interface_addr_from_name(const gchar * const iface_name)
#undef UC
}
static void local_interface_changed_cb(GtkWidget * widget UNUSED, gpointer data UNUSED)
static void local_interface_changed_cb(G_GNUC_UNUSED GtkWidget * widget, G_GNUC_UNUSED gpointer data)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(same_as_local_radio_button))) {
gchar *local_iface_name = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(local_address_combo));
......@@ -609,7 +608,7 @@ static void local_interface_changed_cb(GtkWidget * widget UNUSED, gpointer data
}
}
static void set_published_addr_manually_cb(GtkWidget * widget, gpointer data UNUSED)
static void set_published_addr_manually_cb(GtkWidget * widget, G_GNUC_UNUSED gpointer data)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
DEBUG("Showing manual publishing options");
......@@ -626,7 +625,7 @@ static void set_published_addr_manually_cb(GtkWidget * widget, gpointer data UNU
}
}
static void use_stun_cb(GtkWidget *widget, gpointer data UNUSED)
static void use_stun_cb(GtkWidget *widget, G_GNUC_UNUSED gpointer data)
{
/* Widgets have not been created yet */
if (!stun_server_label)
......@@ -660,7 +659,7 @@ static void use_stun_cb(GtkWidget *widget, gpointer data UNUSED)
}
static void same_as_local_cb(GtkWidget * widget, gpointer data UNUSED)
static void same_as_local_cb(GtkWidget * widget, G_GNUC_UNUSED gpointer data)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
gchar *local_interface = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(local_address_combo));
......@@ -1066,7 +1065,7 @@ GtkWidget* create_advanced_tab(const account_t *account)
return vbox;
}
static void ringtone_enabled_cb(GtkWidget *widget UNUSED, gpointer data, const gchar *accountID UNUSED)
static void ringtone_enabled_cb(G_GNUC_UNUSED GtkWidget *widget, gpointer data, G_GNUC_UNUSED const gchar *accountID)
{
/* toggle sensitivity */
gtk_widget_set_sensitive(data, !gtk_widget_is_sensitive(data));
......
......@@ -38,7 +38,6 @@
#include "actions.h"
#include "mainwindow.h"
#include "utils.h"
#include "unused.h"
#include "logger.h"
#include <glib/gi18n.h>
#include <string.h>
......@@ -103,7 +102,7 @@ find_account_in_account_store(const gchar *accountID, GtkTreeModel *model,
}
static void delete_account_cb(GtkButton *button UNUSED, gpointer data)
static void delete_account_cb(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
gchar *selected_accountID = get_selected_accountID(data);
RETURN_IF_NULL(selected_accountID, "No selected account in delete action");
......@@ -125,8 +124,8 @@ run_account_dialog(const gchar *selected_accountID, SFLPhoneClient *client)
}
static void row_activated_cb(GtkTreeView *view,
GtkTreePath *path UNUSED,
GtkTreeViewColumn *col UNUSED,
G_GNUC_UNUSED GtkTreePath *path,
G_GNUC_UNUSED GtkTreeViewColumn *col,
SFLPhoneClient *client)
{
gchar *selected_accountID = get_selected_accountID(view);
......@@ -140,7 +139,7 @@ typedef struct EditData {
SFLPhoneClient *client;
} EditData;
static void edit_account_cb(GtkButton *button UNUSED, EditData *data)
static void edit_account_cb(G_GNUC_UNUSED GtkButton *button, EditData *data)
{
gchar *selected_accountID = get_selected_accountID(GTK_TREE_VIEW(data->view));
RETURN_IF_NULL(selected_accountID, "No selected account ID");
......@@ -247,7 +246,7 @@ select_account_cb(GtkTreeSelection *selection, GtkTreeModel *model)
}
static void
enable_account_cb(GtkCellRendererToggle *rend UNUSED, gchar* path,
enable_account_cb(G_GNUC_UNUSED GtkCellRendererToggle *rend, gchar* path,
gpointer data)
{
// The IP2IP profile can't be disabled
......@@ -345,7 +344,7 @@ account_move(gboolean move_up, gpointer data)
* Called from move up account button signal
*/
static void
move_up_cb(GtkButton *button UNUSED, gpointer data)
move_up_cb(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
// Change tree view ordering and get index changed
account_move(TRUE, data);
......@@ -355,15 +354,15 @@ move_up_cb(GtkButton *button UNUSED, gpointer data)
* Called from move down account button signal
*/
static void
move_down_cb(GtkButton *button UNUSED, gpointer data)
move_down_cb(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
// Change tree view ordering and get index changed
account_move(FALSE, data);
}
static void
help_contents_cb(GtkWidget * widget UNUSED,
gpointer data UNUSED)
help_contents_cb(G_GNUC_UNUSED GtkWidget * widget,
G_GNUC_UNUSED gpointer data)
{
GError *error = NULL;
gtk_show_uri(NULL, "ghelp:sflphone?accounts", GDK_CURRENT_TIME, &error);
......@@ -374,15 +373,15 @@ help_contents_cb(GtkWidget * widget UNUSED,
}
static void
close_dialog_cb(GtkWidget * widget UNUSED, gpointer data UNUSED)
close_dialog_cb(G_GNUC_UNUSED GtkWidget * widget, G_GNUC_UNUSED gpointer data)
{
gtk_dialog_response(GTK_DIALOG(account_list_dialog), GTK_RESPONSE_ACCEPT);
}
static void
highlight_ip_profile(GtkTreeViewColumn *col UNUSED, GtkCellRenderer *rend,
highlight_ip_profile(G_GNUC_UNUSED GtkTreeViewColumn *col, GtkCellRenderer *rend,
GtkTreeModel *tree_model, GtkTreeIter *iter,
gpointer data UNUSED)
G_GNUC_UNUSED gpointer data)
{
GValue val;
memset(&val, 0, sizeof(val));
......@@ -417,9 +416,9 @@ state_color(account_t *a)
}
static void
highlight_registration(GtkTreeViewColumn *col UNUSED, GtkCellRenderer *rend,
highlight_registration(G_GNUC_UNUSED GtkTreeViewColumn *col, GtkCellRenderer *rend,
GtkTreeModel *tree_model, GtkTreeIter *iter,
gpointer data UNUSED)
G_GNUC_UNUSED gpointer data)
{
GValue val;
memset(&val, 0, sizeof(val));
......
......@@ -31,7 +31,6 @@
#include "addressbook-config.h"
#include "str_utils.h"
#include "dbus.h"
#include "unused.h"
#include "logger.h"
#include "searchbar.h"
#include "contacts/addrbookfactory.h"
......@@ -185,7 +184,7 @@ search_phone_mobile_cb(GtkWidget *widget)
*/
static void
addressbook_config_book_active_toggled(
GtkCellRendererToggle *renderer UNUSED, gchar *path, gpointer data)
G_GNUC_UNUSED GtkCellRendererToggle *renderer, gchar *path, gpointer data)
{
GtkTreeIter iter;
GtkTreePath *treePath;
......
......@@ -30,7 +30,6 @@
#include <string.h>
#include <glib/gi18n.h>
#include "unused.h"
#include "assistant.h"
#include "logger.h"
#include "dbus.h"
......@@ -55,7 +54,7 @@ static gint forward_page_func(gint current_page, gpointer data);
static GtkWidget* create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section);
void prefill_sip(void);
void set_account_type(GtkWidget* widget, gpointer data UNUSED)
void set_account_type(GtkWidget* widget, G_GNUC_UNUSED gpointer data)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
account_type = _SIP;
......@@ -63,7 +62,7 @@ void set_account_type(GtkWidget* widget, gpointer data UNUSED)
account_type = _IAX;
}
static void show_password_cb(GtkWidget *widget UNUSED, gpointer data)
static void show_password_cb(G_GNUC_UNUSED GtkWidget *widget, gpointer data)
{
gtk_entry_set_visibility(GTK_ENTRY(data), !gtk_entry_get_visibility(GTK_ENTRY(data)));
}
......@@ -101,7 +100,7 @@ void getMessageSummary(const gchar * alias, const gchar * server, const gchar *
strcat(message, _("None"));
}
void set_sflphone_org(GtkWidget* widget, gpointer data UNUSED)
void set_sflphone_org(GtkWidget* widget, G_GNUC_UNUSED gpointer data)
{
use_sflphone_org = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
}
......@@ -568,7 +567,7 @@ typedef enum {
PAGE_SUMMARY
} assistant_state;
static gint forward_page_func(gint current_page, gpointer data UNUSED)
static gint forward_page_func(gint current_page, G_GNUC_UNUSED gpointer data)
{
gint next_page = 0;
......
......@@ -39,7 +39,6 @@
#include "dbus/dbus.h"
#include "uimanager.h"
#include "mainwindow.h"
#include "unused.h"
/* FIXME: these should be in a struct rather than at file scope */
static GtkWidget *codecMoveUpButton;
......@@ -266,7 +265,7 @@ update_device_widget(const gchar *pluginName, GtkWidget *output, GtkWidget *inpu
}
static void
select_output_alsa_plugin(GtkComboBox* widget, gpointer data UNUSED)
select_output_alsa_plugin(GtkComboBox* widget, G_GNUC_UNUSED gpointer data)
{
if (!must_show_alsa_conf())
return;
......@@ -327,21 +326,21 @@ get_device_index_from_combobox(GtkComboBox* comboBox)
}
static void
select_audio_output_device(GtkComboBox* comboBox, gpointer data UNUSED)
select_audio_output_device(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
if (gtk_combo_box_get_active(comboBox) >= 0)
dbus_set_audio_output_device(get_device_index_from_combobox(comboBox));
}
static void
select_audio_input_device(GtkComboBox* comboBox, gpointer data UNUSED)
select_audio_input_device(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
if (gtk_combo_box_get_active(comboBox) >= 0)
dbus_set_audio_input_device(get_device_index_from_combobox(comboBox));
}
static void
select_audio_ringtone_device(GtkComboBox *comboBox, gpointer data UNUSED)
select_audio_ringtone_device(GtkComboBox *comboBox, G_GNUC_UNUSED gpointer data)
{
if (gtk_combo_box_get_active(comboBox) >= 0)
dbus_set_audio_ringtone_device(get_device_index_from_combobox(comboBox));
......@@ -369,7 +368,7 @@ select_codec(GtkTreeSelection *selection, GtkTreeModel *model)
* and in configuration files
*/
static void
codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpointer data)
codec_active_toggled(G_GNUC_UNUSED GtkCellRendererToggle *renderer, gchar *path, gpointer data)
{
// Get path of clicked codec active toggle box
GtkTreePath *treePath = gtk_tree_path_new_from_string(path);
......@@ -482,7 +481,7 @@ static void codec_move(gboolean moveUp, gpointer data)
/**
* Called from move up codec button signal
*/
static void codec_move_up(GtkButton *button UNUSED, gpointer data)
static void codec_move_up(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
// Change tree view ordering and get indice changed
codec_move(TRUE, data);
......@@ -491,7 +490,7 @@ static void codec_move_up(GtkButton *button UNUSED, gpointer data)
/**
* Called from move down codec button signal
*/
static void codec_move_down(GtkButton *button UNUSED, gpointer data)
static void codec_move_down(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
// Change tree view ordering and get indice changed
codec_move(FALSE, data);
......@@ -830,7 +829,7 @@ static void restore_recording_path(GtkFileChooser *chooser)
g_free(recording_path);
}
static void record_path_changed(GtkFileChooser *chooser, gpointer data UNUSED)
static void record_path_changed(GtkFileChooser *chooser, G_GNUC_UNUSED gpointer data)
{
gchar* path = gtk_file_chooser_get_filename(chooser);
if (!g_access(path, W_OK)) {
......
......@@ -58,7 +58,6 @@
#include "videoconf.h"
#endif
#include "uimanager.h"
#include "unused.h"
#include "mainwindow.h"
/**
......@@ -95,7 +94,7 @@ set_popup_mode(GtkToggleButton *widget, SFLPhoneClient *client)
}
void
set_notif_level(GtkWidget *widget UNUSED, SFLPhoneClient *client)
set_notif_level(G_GNUC_UNUSED GtkWidget *widget, SFLPhoneClient *client)
{
const gboolean current_state = g_settings_get_boolean(client->settings, "notify-all");
g_settings_set_boolean(client->settings, "notify-all", !current_state);
......@@ -271,7 +270,7 @@ save_configuration_parameters(SFLPhoneClient *client)
}
void
selection_changed_cb(GtkIconView *view, gpointer user_data UNUSED)
selection_changed_cb(GtkIconView *view, G_GNUC_UNUSED gpointer user_data)
{
GtkTreeModel *model;
GtkTreeIter iter;
......
......@@ -33,12 +33,11 @@
#include <X11/XKBlib.h>
#include "shortcuts-config.h"
#include "shortcuts.h"
#include "unused.h"
#include "logger.h"
static void
accel_cleared(GtkCellRendererAccel *renderer UNUSED, gchar *path,
accel_cleared(G_GNUC_UNUSED GtkCellRendererAccel *renderer, gchar *path,
GtkTreeView *treeview)
{
// Update treeview
......@@ -54,8 +53,8 @@ accel_cleared(GtkCellRendererAccel *renderer UNUSED, gchar *path,
}
static void
accel_edited(GtkCellRendererAccel *renderer UNUSED, gchar *path, guint accel_key,
GdkModifierType mask, guint hardware_keycode UNUSED, GtkTreeView *treeview)
accel_edited(G_GNUC_UNUSED GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
GdkModifierType mask, G_GNUC_UNUSED guint hardware_keycode, GtkTreeView *treeview)
{
// Disable existing binding if key already used
GtkTreeModel *model = gtk_tree_view_get_model(treeview);
......
......@@ -33,7 +33,6 @@
#include "videoconf.h"
#include "logger.h"
#include "utils.h"
#include "unused.h"
#include "dbus.h"
#include "codeclist.h"
......@@ -101,7 +100,7 @@ static const gchar *const PREVIEW_START_STR = "_Start";
static const gchar *const PREVIEW_STOP_STR = "_Stop";
static void
preview_button_toggled(GtkButton *button, gpointer data UNUSED)
preview_button_toggled(GtkButton *button, G_GNUC_UNUSED gpointer data)
{
preview_button = GTK_WIDGET(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
......@@ -218,7 +217,7 @@ video_codec_list_get_by_name(GPtrArray *vcodecs, const gchar *name)
}
static void
codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path,
codec_active_toggled(G_GNUC_UNUSED GtkCellRendererToggle *renderer, gchar *path,
gpointer data)
{
account_t *acc = (account_t*) data;
......@@ -346,7 +345,7 @@ codec_move(gboolean move_up, gpointer data)
* Called from move up codec button signal
*/
static void
codec_move_up(GtkButton *button UNUSED, gpointer data)
codec_move_up(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
codec_move(TRUE, data);
}
......@@ -355,13 +354,13 @@ codec_move_up(GtkButton *button UNUSED, gpointer data)
* Called from move down codec button signal
*/
static void
codec_move_down(GtkButton *button UNUSED, gpointer data)
codec_move_down(G_GNUC_UNUSED GtkButton *button, gpointer data)
{
codec_move(FALSE, data);
}
static void
bitrate_edited_cb(GtkCellRenderer *renderer UNUSED, gchar *path, gchar *new_text, gpointer data)
bitrate_edited_cb(G_GNUC_UNUSED GtkCellRenderer *renderer, gchar *path, gchar *new_text, gpointer data)
{
// Retrieve userdata
account_t *acc = (account_t*) data;
......@@ -412,7 +411,7 @@ bitrate_edited_cb(GtkCellRenderer *renderer UNUSED, gchar *path, gchar *new_text
static void
parameters_edited_cb(GtkCellRenderer *renderer UNUSED, gchar *path, gchar *new_text, gpointer data)
parameters_edited_cb(G_GNUC_UNUSED GtkCellRenderer *renderer, gchar *path, gchar *new_text, gpointer data)
{
account_t *acc = (account_t*) data;
......@@ -619,7 +618,7 @@ preferences_dialog_fill_video_input_device_rate_list()
* Set the video input device rate on the server
*/
static void
select_video_input_device_rate_cb(GtkComboBox* comboBox, gpointer data UNUSED)
select_video_input_device_rate_cb(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
gchar *str = get_active_text(comboBox);
if (str)
......@@ -671,7 +670,7 @@ preferences_dialog_fill_video_input_device_size_list()
* Set the video input device size on the server
*/
static void
select_video_input_device_size_cb(GtkComboBox* comboBox, gpointer data UNUSED)
select_video_input_device_size_cb(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
gchar *str = get_active_text(comboBox);
if (str) {
......@@ -723,7 +722,7 @@ preferences_dialog_fill_video_input_device_channel_list()
* Set the video input device input on the server
*/
static void
select_video_input_device_channel_cb(GtkComboBox* comboBox, gpointer data UNUSED)
select_video_input_device_channel_cb(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
gchar *str = get_active_text(comboBox);
if (str) {
......@@ -770,7 +769,7 @@ preferences_dialog_fill_video_input_device_list()
* Set the video input device on the server
*/
static void
select_video_input_device_cb(GtkComboBox* comboBox, gpointer data UNUSED)
select_video_input_device_cb(GtkComboBox* comboBox, G_GNUC_UNUSED gpointer data)
{
gchar *str = get_active_text(comboBox);
if (str) {
......@@ -796,7 +795,7 @@ fill_devices()
}
void
video_device_event_cb(DBusGProxy *proxy UNUSED, void * foo UNUSED)
video_device_event_cb(G_GNUC_UNUSED DBusGProxy *proxy, G_GNUC_UNUSED gpointer foo)
{
fill_devices();
}
......
......@@ -33,7 +33,6 @@
#include <string.h>
#include "calltab.h"
#include "calltree.h"
#include "unused.h"
#include "logger.h"
// Must return 0 when a match is found
......@@ -92,7 +91,7 @@ void calllist_add_contact(gchar *contact_name, gchar *contact_phone, contact_typ
* Function passed to calllist_clean to free every callable_obj_t.
*/
static void
calllist_free_element(gpointer data, gpointer user_data UNUSED)
calllist_free_element(gpointer data, G_GNUC_UNUSED gpointer user_data)
{
callable_obj_t *call = data;
free_callable_obj_t(call);
......
......@@ -42,7 +42,6 @@
#include <stdlib.h>
#include <gtk/gtk.h>
#include "unused.h"
#include "dbus.h"
#include "calltab.h"
#include "logger.h"
......@@ -143,9 +142,9 @@ call_selected_cb(GtkTreeSelection *sel, SFLPhoneClient *client)
/* A row is activated when it is double clicked */
static void
row_activated_cb(GtkTreeView *tree_view UNUSED,
GtkTreePath *path UNUSED,
GtkTreeViewColumn *column UNUSED,
row_activated_cb(G_GNUC_UNUSED GtkTreeView *tree_view,
G_GNUC_UNUSED GtkTreePath *path,
G_GNUC_UNUSED GtkTreeViewColumn *column,
SFLPhoneClient *client)
{
if (calltab_get_selected_type(active_calltree_tab) == A_CALL) {
......@@ -215,7 +214,7 @@ row_activated_cb(GtkTreeView *tree_view UNUSED,
/* Catch cursor-activated signal. That is, when the entry is single clicked */
static void
row_single_click(GtkTreeView *tree_view UNUSED, SFLPhoneClient *client)
row_single_click(G_GNUC_UNUSED GtkTreeView *tree_view, SFLPhoneClient *client)
{
gchar * displaySasOnce = NULL;
......@@ -509,7 +508,7 @@ calltree_create(calltab_t* tab, gboolean has_searchbar, SFLPhoneClient *client)
}
static gboolean
remove_element_if_match(GtkTreeModel *model, GtkTreePath *path UNUSED, GtkTreeIter *iter, gpointer data)
remove_element_if_match(GtkTreeModel *model, G_GNUC_UNUSED GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
const gchar *target_id = (const gchar *) data;
gchar *id;
...