Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. ANSIfy
2005-11-14 Kjartan Maraas <kmaraas@gnome.org> * */*: Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. * libkbddraw/keyboard-drawing.h: ANSIfy some function declarations.
This commit is contained in:
parent
c64b931ac0
commit
564a9d03aa
56 changed files with 165 additions and 166 deletions
|
@ -1,3 +1,20 @@
|
|||
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* actions/acme-volume-dummy.c: (acme_volume_dummy_finalize):
|
||||
* actions/acme-volume.c: (acme_volume_class_init),
|
||||
(acme_volume_new):
|
||||
* clipboard-manager.c: (clipboard_bytes_per_item),
|
||||
(clipboard_manager_process_event):
|
||||
* gnome-settings-daemon.c:
|
||||
(gnome_settings_daemon_spawn_with_input):
|
||||
* gnome-settings-default-editor.c: (vfs_change_cb):
|
||||
* gnome-settings-keybindings.c: (grab_key):
|
||||
* gnome-settings-typing-break.c:
|
||||
* gnome-settings-xrdb.c: (scan_ad_directory):
|
||||
* gnome-settings-xsettings.c: (type_to_string):
|
||||
* xsettings-manager.c: Remove unused code and functions. Mark
|
||||
some functions static and fix other compiler warnings.
|
||||
|
||||
2005-10-21 Ray Strode <rstrode@redhat.com>
|
||||
|
||||
Remap buttons on auxillary mice for left-handed
|
||||
|
|
|
@ -31,13 +31,9 @@ static void acme_volume_dummy_set_volume (AcmeVolume *self, int val);
|
|||
static void
|
||||
acme_volume_dummy_finalize (GObject *object)
|
||||
{
|
||||
AcmeVolumeDummy *self;
|
||||
|
||||
g_return_if_fail (object != NULL);
|
||||
g_return_if_fail (ACME_IS_VOLUME_DUMMY (object));
|
||||
|
||||
self = ACME_VOLUME_DUMMY (object);
|
||||
|
||||
G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ static void
|
|||
acme_volume_class_init (AcmeVolumeClass *klass)
|
||||
{
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
};
|
||||
}
|
||||
|
||||
static void
|
||||
acme_volume_init (AcmeVolume *vol)
|
||||
|
@ -115,6 +115,5 @@ AcmeVolume *acme_volume_new (void)
|
|||
vol = ACME_VOLUME (g_object_new (acme_volume_oss_get_type (), NULL));
|
||||
return vol;
|
||||
#endif
|
||||
return ACME_VOLUME (g_object_new (acme_volume_dummy_get_type (), NULL));
|
||||
}
|
||||
|
||||
|
|
|
@ -165,13 +165,10 @@ clipboard_bytes_per_item (int format)
|
|||
{
|
||||
case 8:
|
||||
return sizeof (char);
|
||||
break;
|
||||
case 16:
|
||||
return sizeof (short);
|
||||
break;
|
||||
case 32:
|
||||
return sizeof (long);
|
||||
break;
|
||||
default: ;
|
||||
}
|
||||
return 0;
|
||||
|
@ -703,7 +700,6 @@ clipboard_manager_process_event (ClipboardManager *manager,
|
|||
return receive_incrementally (manager, xev);
|
||||
else
|
||||
return send_incrementally (manager, xev);
|
||||
break;
|
||||
|
||||
case SelectionClear:
|
||||
if (xev->xany.window != manager->window)
|
||||
|
|
|
@ -214,7 +214,7 @@ manager_event_filter (GdkXEvent *xevent,
|
|||
return GDK_FILTER_CONTINUE;
|
||||
}
|
||||
|
||||
CORBA_boolean
|
||||
static CORBA_boolean
|
||||
awake_impl (PortableServer_Servant servant,
|
||||
const CORBA_char *service,
|
||||
CORBA_Environment *ev)
|
||||
|
@ -416,34 +416,6 @@ gnome_settings_daemon_new (void)
|
|||
|
||||
/* Helper functions */
|
||||
|
||||
/*
|
||||
* Helper function for spawn_with_input() - wait for a child
|
||||
* to exit.
|
||||
*/
|
||||
gboolean
|
||||
wait_for_child (int pid,
|
||||
int *status)
|
||||
{
|
||||
gint ret;
|
||||
|
||||
again:
|
||||
ret = waitpid (pid, status, 0);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
if (errno == EINTR)
|
||||
goto again;
|
||||
else
|
||||
{
|
||||
g_warning ("Unexpected error in waitpid() (%s)",
|
||||
g_strerror (errno));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
child_watch_cb (GPid pid, gint status, gpointer user_data)
|
||||
{
|
||||
|
@ -500,7 +472,6 @@ void
|
|||
gnome_settings_daemon_spawn_with_input (char **argv,
|
||||
const char *input)
|
||||
{
|
||||
int exit_status;
|
||||
int child_pid;
|
||||
int inpipe;
|
||||
GError *err = NULL;
|
||||
|
@ -513,7 +484,7 @@ gnome_settings_daemon_spawn_with_input (char **argv,
|
|||
&inpipe, NULL, NULL, /* stdin, stdout, stderr */
|
||||
&err))
|
||||
{
|
||||
gchar *command = g_strjoinv (" ", argv);
|
||||
command = g_strjoinv (" ", argv);
|
||||
g_warning ("Could not execute %s: %s", command, err->message);
|
||||
g_error_free (err);
|
||||
g_free (command);
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
static gboolean sync_changes;
|
||||
|
||||
#if DE_DEBUG
|
||||
#ifdef DE_DEBUG
|
||||
static void
|
||||
print_mime_app (const char *mime_type)
|
||||
{
|
||||
|
@ -106,7 +106,7 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client)
|
|||
return;
|
||||
}
|
||||
|
||||
#if DE_DEBUG
|
||||
#ifdef DE_DEBUG
|
||||
g_message ("Synching text/plain to text/*...");
|
||||
#endif
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ screen_exec_display_string (GdkScreen *screen)
|
|||
* mainly ripped from egg_screen_exec_display_string in
|
||||
* gnome-panel/egg-screen-exec.c
|
||||
**/
|
||||
char **
|
||||
static char **
|
||||
get_exec_environment (XEvent *xevent)
|
||||
{
|
||||
char **retval = NULL;
|
||||
|
@ -169,7 +169,7 @@ parse_binding (Binding *binding)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
static gboolean
|
||||
bindings_get_entry (char *subdir)
|
||||
{
|
||||
GConfValue *value;
|
||||
|
@ -289,7 +289,7 @@ grab_key (GdkWindow *root, Key *key, int result, gboolean grab)
|
|||
gdk_flush ();
|
||||
if (gdk_error_trap_pop ()) {
|
||||
g_warning (_("It seems that another application already has"
|
||||
" access to key '%d'."), key->keycode);
|
||||
" access to key '%u'."), key->keycode);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -330,7 +330,7 @@ do_grab (gboolean grab,
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
binding_register_keys (void)
|
||||
{
|
||||
GSList *li;
|
||||
|
@ -380,7 +380,7 @@ bindings_callback (GConfEntry *entry)
|
|||
binding_register_keys ();
|
||||
}
|
||||
|
||||
GdkFilterReturn
|
||||
static GdkFilterReturn
|
||||
keybindings_filter (GdkXEvent *gdk_xevent,
|
||||
GdkEvent *event,
|
||||
gpointer data)
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "reaper.h"
|
||||
#include <string.h>
|
||||
|
||||
pid_t typing_monitor_pid = 0;
|
||||
guint typing_monitor_idle_id = 0;
|
||||
static pid_t typing_monitor_pid = 0;
|
||||
static guint typing_monitor_idle_id = 0;
|
||||
|
||||
static gboolean
|
||||
typing_break_timeout (gpointer data)
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme"
|
||||
|
||||
GtkWidget *widget;
|
||||
static GtkWidget *widget;
|
||||
|
||||
/*
|
||||
* Theme colour functions
|
||||
|
@ -171,8 +171,6 @@ scan_ad_directory (const char *path, GError **error)
|
|||
return NULL;
|
||||
}
|
||||
while ((entry = g_dir_read_name (dir)) != NULL) {
|
||||
int len;
|
||||
len = strlen (entry);
|
||||
if (g_str_has_suffix (entry, ".ad")) {
|
||||
list = g_slist_prepend (list, g_strdup_printf ("%s/%s", path, entry));
|
||||
}
|
||||
|
|
|
@ -164,32 +164,23 @@ type_to_string (GConfValueType type)
|
|||
{
|
||||
case GCONF_VALUE_INT:
|
||||
return "int";
|
||||
break;
|
||||
case GCONF_VALUE_STRING:
|
||||
return "string";
|
||||
break;
|
||||
case GCONF_VALUE_FLOAT:
|
||||
return "float";
|
||||
break;
|
||||
case GCONF_VALUE_BOOL:
|
||||
return "bool";
|
||||
break;
|
||||
case GCONF_VALUE_SCHEMA:
|
||||
return "schema";
|
||||
break;
|
||||
case GCONF_VALUE_LIST:
|
||||
return "list";
|
||||
break;
|
||||
case GCONF_VALUE_PAIR:
|
||||
return "pair";
|
||||
break;
|
||||
case GCONF_VALUE_INVALID:
|
||||
return "*invalid*";
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
return NULL; /* for warnings */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ struct _XSettingsManager
|
|||
unsigned long serial;
|
||||
};
|
||||
|
||||
XSettingsList *settings;
|
||||
static XSettingsList *settings;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
@ -295,7 +295,7 @@ xsettings_manager_set_color (XSettingsManager *manager,
|
|||
return xsettings_manager_set_setting (manager, &setting);
|
||||
}
|
||||
|
||||
size_t
|
||||
static size_t
|
||||
setting_length (XSettingsSetting *setting)
|
||||
{
|
||||
size_t length = 8; /* type + pad + name-len + last-change-serial */
|
||||
|
@ -317,7 +317,7 @@ setting_length (XSettingsSetting *setting)
|
|||
return length;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
setting_store (XSettingsSetting *setting,
|
||||
XSettingsBuffer *buffer)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue