Skip to content
Snippets Groups Projects
Commit 5fc29fa3 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#3376] Code cleanup

parent 293bef94
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 97 additions and 80 deletions
sflphone-client-gnome/INSTALL
+ 80
− 17
View file @ 5fc29fa3
......@@ -4,8 +4,10 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.
Basic Installation
==================
......@@ -13,7 +15,11 @@ Basic Installation
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
......@@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
user, and only the `make install' phase executed with root
privileges.
5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
regular user, particularly if the prior `make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
......@@ -67,8 +83,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
7. Often, you can also type `make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
8. Some packages, particularly those that use Automake, provide `make
distcheck', which can by used by developers to test that all other
targets like `make install' and `make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
......@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
source code in the directory that `configure' is in and in `..'. This
is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
......@@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
`configure' the option `--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
......@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
`make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
`${prefix}'. Any directories that were specified during `configure',
but not in terms of `${prefix}', must each be overridden at install
time for the entire installation to be relocated. The approach of
makefile variable overrides for each directory variable is required by
the GNU Coding Standards, and ideally causes no recompilation.
However, some platforms have known limitations with the semantics of
shared libraries that end up requiring recompilation when using this
method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
example, `make install DESTDIR=/alternate/directory' will prepend
`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
at `configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
......@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
execution of `make' will be. For these packages, running `./configure
--enable-silent-rules' sets the default to minimal output, which can be
overridden with `make V=1'; while running `./configure
--disable-silent-rules' sets the default to verbose, which can be
overridden with `make V=0'.
Particular systems
==================
......@@ -288,7 +351,7 @@ operates.
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
......
sflphone-client-gnome/Makefile.am
+ 2
− 0
View file @ 5fc29fa3
SUBDIRS = src pixmaps tests man po doc
CFLAGS=-Wall -Werror -Wextra
ACLOCAL_AMFLAGS = -I m4
GCONFTOOL=gconftool-2
......
sflphone-client-gnome/configure.ac
+ 1
− 1
View file @ 5fc29fa3
......@@ -24,7 +24,7 @@ AC_ARG_WITH(debug,
if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
CFLAGS="-g -O0 -DDEBUG -Wall -Wextra"
else
CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Wextra -Werror"
fi
AC_PROG_CC
......
sflphone-client-gnome/src/config/addressbook-config.c
+ 1
− 1
View file @ 5fc29fa3
......@@ -301,7 +301,7 @@ addressbook_config_fill_book_list()
create_addressbook_settings()
{
GtkWidget *ret, *result_frame, *table, *value, *label, *item;
GtkWidget *ret, *result_frame, *table, *value, *item;
GtkListStore *store;
GtkCellRenderer *renderer;
......
sflphone-client-gnome/src/config/assistant.c
+ 1
− 3
View file @ 5fc29fa3
......@@ -70,7 +70,7 @@ void set_account_type( GtkWidget* widget , gpointer data UNUSED ) {
}
}
static void show_password_cb (GtkWidget *widget, gpointer data)
static void show_password_cb (GtkWidget *widget UNUSED, gpointer data)
{
gtk_entry_set_visibility (GTK_ENTRY (data), !gtk_entry_get_visibility (GTK_ENTRY (data)));
}
......@@ -312,7 +312,6 @@ GtkWidget* build_sfl_or_account() {
GtkWidget* build_sip_account_configuration( void ) {
GtkWidget* table;
GtkWidget* label;
GtkWidget *image;
GtkWidget * clearTextCheckbox;
wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("SIP account settings") , _("Please fill the following information"));
......@@ -425,7 +424,6 @@ GtkWidget* build_email_configuration( void ) {
GtkWidget* build_iax_account_configuration( void ) {
GtkWidget* label;
GtkWidget* table;
GtkWidget *image;
GtkWidget * clearTextCheckbox;
wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("IAX2 account settings") , _("Please fill the following information"));
......
sflphone-client-gnome/src/config/preferencesdialog.c
+ 7
− 5
View file @ 5fc29fa3
......@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <eel-gconf-extensions.h>
#include <accountconfigdialog.h>
#include <addressbook-config.h>
......@@ -98,7 +99,7 @@ start_hidden (void)
}
static void
set_popup_mode (GtkWidget *widget, gpointer *userdata)
set_popup_mode (GtkWidget *widget, gpointer *userdata UNUSED)
{
gboolean currentstate = eel_gconf_get_integer (POPUP_ON_CALL);
if (currentstate || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
......@@ -114,7 +115,7 @@ set_notif_level ()
}
static void
history_limit_cb (GtkSpinButton *button, void *ptr)
history_limit_cb (GtkSpinButton *button UNUSED, void *ptr)
{
history_limit = gtk_spin_button_get_value_as_int ((GtkSpinButton *) (ptr));
}
......@@ -135,7 +136,7 @@ clean_history (void)
calllist_clean_history ();
}
void showstatusicon_cb (GtkWidget *widget, gpointer data) {
void showstatusicon_cb (GtkWidget *widget, gpointer data UNUSED) {
gboolean currentstatus = FALSE;
......@@ -158,7 +159,7 @@ void showstatusicon_cb (GtkWidget *widget, gpointer data) {
create_general_settings ()
{
GtkWidget *ret, *notifAll, *trayItem, *frame, *checkBoxWidget, *label, *table, *showstatusicon;
GtkWidget *ret, *notifAll, *frame, *checkBoxWidget, *label, *table, *showstatusicon;
gboolean statusicon;
// Load history configuration
......@@ -280,7 +281,8 @@ history_load_configuration ()
}
gboolean selection_changed_cb (GtkIconView *view, gpointer user_data) {
void
selection_changed_cb (GtkIconView *view, gpointer user_data UNUSED) {
GtkTreeModel *model;
GtkTreeIter iter;
......
sflphone-client-gnome/src/config/shortcuts-config.c
+ 5
− 5
View file @ 5fc29fa3
......@@ -36,7 +36,7 @@
GtkWidget*
create_shortcuts_settings ()
{
GtkWidget *vbox, *result_frame, *window, *treeview, *scrolled_window, *label;
GtkWidget *vbox, *result_frame, *treeview, *label;
GtkTreeIter iter;
guint i = 0;
......@@ -104,8 +104,8 @@ setup_tree_view (GtkWidget *treeview)
}
static void
accel_edited (GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
GdkModifierType mask, guint hardware_keycode, GtkTreeView *treeview)
accel_edited (GtkCellRendererAccel *renderer UNUSED, gchar *path, guint accel_key,
GdkModifierType mask, guint hardware_keycode UNUSED, GtkTreeView *treeview)
{
DEBUG("Accel edited");
......@@ -114,7 +114,7 @@ accel_edited (GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
Accelerator* list = shortcuts_get_list ();
model = gtk_tree_view_get_model (treeview);
gint code = XKeysymToKeycode (GDK_DISPLAY(), accel_key);
guint code = XKeysymToKeycode (GDK_DISPLAY(), accel_key);
// Disable existing binding if key already used
int i = 0;
......@@ -141,7 +141,7 @@ accel_edited (GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
}
static void
accel_cleared (GtkCellRendererAccel *renderer, gchar *path,
accel_cleared (GtkCellRendererAccel *renderer UNUSED, gchar *path,
GtkTreeView *treeview)
{
DEBUG("Accel cleared");
......
sflphone-client-gnome/src/shortcuts.h
+ 0
− 46
View file @ 5fc29fa3
......@@ -40,52 +40,6 @@ typedef struct
(*callback) (void);
} Accelerator;
static void
grab_key (guint key, GdkModifierType mask, const GdkWindow *root);
static void
ungrab_key (guint key, GdkModifierType mask, const GdkWindow *root);
static GdkFilterReturn
filter_keys (const GdkXEvent *xevent, const GdkEvent *event, gpointer data);
static void
remove_bindings ();
static void
create_bindings ();
static void
pick_up_callback ();
static void
hang_up_callback ();
static void
toggle_pick_up_hang_up_callback ();
static void
toggle_hold_callback ();
static void
initialize_binding (const gchar* action, guint key, GdkModifierType mask);
static void
initialize_shortcuts_keys ();
static void*
get_action_callback (const gchar* action);
static void
update_bindings_data (guint index, guint key, GdkModifierType mask);
static void
update_shortcuts_map (const gchar* action, guint value, GdkModifierType mask);
/*
* "Public" functions
*/
void
shortcuts_initialize_bindings ();
......
sflphone-client-gnome/src/uimanager.h
+ 0
− 2
View file @ 5fc29fa3
......@@ -44,8 +44,6 @@ GtkAction *volumeToggle;
gboolean uimanager_new (GtkUIManager**);
static void show_edit_number ();
void update_voicemail_status (void);
G_END_DECLS
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment