applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. ANSIfy

Browse source 
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:
Kjartan Maraas 2005-11-14 15:18:09 +00:00 • committed by Kjartan Maraas
parent c64b931ac0
commit 564a9d03aa
56 changed files with 165 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
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.
2005-10-31 Jürg Billeter <j@bitron.ch> 2005-10-31 Jürg Billeter <j@bitron.ch>
reviewed by: Rodrigo Moya <rodrigo@novell.com> reviewed by: Rodrigo Moya <rodrigo@novell.com>

4
capplets/accessibility/at-properties/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* at-startup-session.c: Mark at_startup_string_compare() static.
2004-11-09 Mark McLoughlin <mark@skynet.ie> 2004-11-09 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: install the .desktop file in * Makefile.am: install the .desktop file in

2
capplets/accessibility/at-properties/at-startup-session.c
View file

@ -26,7 +26,7 @@ at_startup_get_list (GConfClient *client)
return at_list; return at_list;
} }
gint static gint
at_startup_string_compare (gconstpointer s1, gconstpointer s2) at_startup_string_compare (gconstpointer s1, gconstpointer s2)
{ {
if (s1 && s2) { if (s1 && s2) {

4
capplets/accessibility/keyboard/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* accessibility-keyboard.c: Add #include "accessibility-keyboard.h".
2005-08-14 Sebastien Bacher <seb128@debian.org> 2005-08-14 Sebastien Bacher <seb128@debian.org>
* accessibility-keyboard.c: (setup_ranges): * accessibility-keyboard.c: (setup_ranges):

1
capplets/accessibility/keyboard/accessibility-keyboard.c
View file

@ -25,6 +25,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include "accessibility-keyboard.h"
#include <gnome.h> #include <gnome.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h> #include <glade/glade.h>

10
capplets/common/ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* capplet-stock-icons.c: (capplet_register_stock_icons): Remove
unused variable.
* file-transfer-dialog.c: (file_transfer_dialog_update_num_files):
Fix format specifiers.
* gconf-property-editor.c: Mark some functions static.
* gnome-theme-info.c: (top_theme_dir_changed),
(top_icon_theme_dir_changed): Remove unused code.
2005-10-11 Muktha <muktha.narayan@wipro.com> 2005-10-11 Muktha <muktha.narayan@wipro.com>
* gnome-theme-info.h: * gnome-theme-info.h:

2
capplets/common/capplet-stock-icons.c
View file

@ -80,10 +80,8 @@ capplet_register_stock_icons (GtkIconFactory *factory)
{ {
gint i; gint i;
GtkIconSource *source; GtkIconSource *source;
GnomeProgram *program;
source = gtk_icon_source_new (); source = gtk_icon_source_new ();
program = gnome_program_get ();
for (i = 0; i < G_N_ELEMENTS (items); ++i) { for (i = 0; i < G_N_ELEMENTS (items); ++i) {
GtkIconSet *icon_set; GtkIconSet *icon_set;

2
capplets/common/file-transfer-dialog.c
View file

@ -91,7 +91,7 @@ file_transfer_dialog_finalize (GObject *obj)
static void static void
file_transfer_dialog_update_num_files (FileTransferDialog *dlg) file_transfer_dialog_update_num_files (FileTransferDialog *dlg)
{ {
gchar *str = g_strdup_printf (_("Copying file: %i of %i"), gchar *str = g_strdup_printf (_("Copying file: %u of %u"),
dlg->priv->nth, dlg->priv->total); dlg->priv->nth, dlg->priv->total);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (dlg->priv->progress), str); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (dlg->priv->progress), str);
g_free (str); g_free (str);

8
capplets/common/gconf-property-editor.c
View file

@ -1447,7 +1447,7 @@ gconf_peditor_new_enum_toggle (GConfChangeSet *changeset,
return G_OBJECT (peditor); return G_OBJECT (peditor);
} }
gboolean static gboolean
peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename) peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
{ {
GdkPixbuf *pixbuf = NULL; GdkPixbuf *pixbuf = NULL;
@ -1523,7 +1523,7 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
return TRUE; return TRUE;
} }
void static void
peditor_image_chooser_response_cb (GtkWidget *chooser, peditor_image_chooser_response_cb (GtkWidget *chooser,
gint response, gint response,
GConfPropertyEditor *peditor) GConfPropertyEditor *peditor)
@ -1561,7 +1561,7 @@ peditor_image_chooser_response_cb (GtkWidget *chooser,
gtk_widget_destroy (chooser); gtk_widget_destroy (chooser);
} }
void static void
peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser, peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser,
GtkImage *preview) GtkImage *preview)
{ {
@ -1582,7 +1582,7 @@ peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser,
gdk_pixbuf_unref (pixbuf); gdk_pixbuf_unref (pixbuf);
} }
void static void
peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button) peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button)
{ {
GConfValue *value = NULL, *value_wid; GConfValue *value = NULL, *value_wid;

2
capplets/common/gnome-theme-info.c
View file

@ -964,7 +964,6 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
else if (event_type == GNOME_VFS_MONITOR_EVENT_DELETED) else if (event_type == GNOME_VFS_MONITOR_EVENT_DELETED)
{ {
gchar *name; gchar *name;
CommonThemeDirMonitorData *monitor_data;
name = gnome_vfs_uri_extract_short_name (common_theme_dir_uri); name = gnome_vfs_uri_extract_short_name (common_theme_dir_uri);
monitor_data = g_hash_table_lookup (handle_hash, name); monitor_data = g_hash_table_lookup (handle_hash, name);
@ -1016,7 +1015,6 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle *handle,
else if (event_type == GNOME_VFS_MONITOR_EVENT_DELETED) else if (event_type == GNOME_VFS_MONITOR_EVENT_DELETED)
{ {
gchar *name; gchar *name;
CommonIconThemeDirMonitorData *monitor_data;
name = gnome_vfs_uri_extract_short_name (common_icon_theme_dir_uri); name = gnome_vfs_uri_extract_short_name (common_icon_theme_dir_uri);
monitor_data = g_hash_table_lookup (handle_hash, name); monitor_data = g_hash_table_lookup (handle_hash, name);

5
capplets/default-applications/ChangeLog
View file

@ -1,3 +1,8 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-default-applications-properties-structs.c: Mark the
structs static.
2005-10-20 Colin Leroy <colin@colino.net> 2005-10-20 Colin Leroy <colin@colino.net>
* gnome-default-applications-properties-structs.c: added * gnome-default-applications-properties-structs.c: added

6
capplets/default-applications/gnome-default-applications-properties-structs.c
View file

@ -5,7 +5,7 @@ struct _BrowserDescription {
gboolean needs_term; gboolean needs_term;
gboolean in_path; gboolean in_path;
}; };
BrowserDescription possible_browsers[] = { static BrowserDescription possible_browsers[] = {
{ N_("Debian Sensible Browser"), "sensible-browser", "sensible-browser %s", FALSE, FALSE }, { N_("Debian Sensible Browser"), "sensible-browser", "sensible-browser %s", FALSE, FALSE },
{ N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE }, { N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE },
{ N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE }, { N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE },
@ -28,7 +28,7 @@ struct _MailerDescription {
gboolean needs_term; gboolean needs_term;
gboolean in_path; gboolean in_path;
}; };
MailerDescription possible_mailers[] = { static MailerDescription possible_mailers[] = {
/* The code in gnome-default-applications-properties.c makes sure /* The code in gnome-default-applications-properties.c makes sure
* there is only one (the first entry in this list) Evolution entry * there is only one (the first entry in this list) Evolution entry
* in the list shown to the user * in the list shown to the user
@ -55,7 +55,7 @@ struct _TerminalDesciption {
gchar const *exec_arg; gchar const *exec_arg;
gboolean in_path; gboolean in_path;
}; };
TerminalDescription possible_terminals[] = { static TerminalDescription possible_terminals[] = {
{ N_("Debian Terminal Emulator"), "x-terminal-emulator", "-e", FALSE }, { N_("Debian Terminal Emulator"), "x-terminal-emulator", "-e", FALSE },
{ N_("GNOME Terminal"), "gnome-terminal", "-x", FALSE }, { N_("GNOME Terminal"), "gnome-terminal", "-x", FALSE },
{ N_("Standard XTerminal"), "xterm", "-e", FALSE }, { N_("Standard XTerminal"), "xterm", "-e", FALSE },

4
capplets/display/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* main.c: Mark some functions static.
2005-07-20 Rodrigo Moya <rodrigo@novell.com> 2005-07-20 Rodrigo Moya <rodrigo@novell.com>
* main.c (get_screensaver_command): new function to get the correct * main.c (get_screensaver_command): new function to get the correct

8
capplets/display/main.c
View file

@ -44,7 +44,7 @@ struct DisplayInfo {
static void generate_rate_menu (struct ScreenInfo *screen_info); static void generate_rate_menu (struct ScreenInfo *screen_info);
static void generate_resolution_menu(struct ScreenInfo* screen_info); static void generate_resolution_menu(struct ScreenInfo* screen_info);
struct DisplayInfo * static struct DisplayInfo *
read_display_info (GdkDisplay *display) read_display_info (GdkDisplay *display)
{ {
struct DisplayInfo *info; struct DisplayInfo *info;
@ -77,7 +77,7 @@ read_display_info (GdkDisplay *display)
return info; return info;
} }
void static void
update_display_info (struct DisplayInfo *info, GdkDisplay *display) update_display_info (struct DisplayInfo *info, GdkDisplay *display)
{ {
struct ScreenInfo *screen_info; struct ScreenInfo *screen_info;
@ -586,13 +586,13 @@ struct TimeoutData {
gboolean timed_out; gboolean timed_out;
}; };
char * static char *
timeout_string (int time) timeout_string (int time)
{ {
return g_strdup_printf (ngettext ("Testing the new settings. If you don't respond in %d second the previous settings will be restored.", "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored.", time), time); return g_strdup_printf (ngettext ("Testing the new settings. If you don't respond in %d second the previous settings will be restored.", "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored.", time), time);
} }
gboolean static gboolean
save_timeout_callback (gpointer _data) save_timeout_callback (gpointer _data)
{ {
struct TimeoutData *data = _data; struct TimeoutData *data = _data;

4
capplets/font/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* main.c: (setup_font_sample): Fix compiler warnings.
2005-05-22 Sebastien Bacher <seb128@debian.org> 2005-05-22 Sebastien Bacher <seb128@debian.org>
* font-properties.glade: * font-properties.glade:

8
capplets/font/main.c
View file

@ -232,9 +232,9 @@ setup_font_sample (GtkWidget *darea,
FcPatternDestroy (pattern); FcPatternDestroy (pattern);
if (font1) if (font1)
XftTextExtentsUtf8 (xdisplay, font1, (char *)string1, strlen (string1), &extents1); XftTextExtentsUtf8 (xdisplay, font1, (unsigned char *)string1, strlen (string1), &extents1);
if (font2) if (font2)
XftTextExtentsUtf8 (xdisplay, font2, (char *)string2, strlen (string2), &extents2); XftTextExtentsUtf8 (xdisplay, font2, (unsigned char *)string2, strlen (string2), &extents2);
ascent = 0; ascent = 0;
if (font1) if (font1)
@ -271,11 +271,11 @@ setup_font_sample (GtkWidget *darea,
if (font1) if (font1)
XftDrawStringUtf8 (draw, &black, font1, XftDrawStringUtf8 (draw, &black, font1,
2, 2 + ascent, 2, 2 + ascent,
(char *)string1, strlen (string1)); (unsigned char *)string1, strlen (string1));
if (font2) if (font2)
XftDrawStringUtf8 (draw, &black, font2, XftDrawStringUtf8 (draw, &black, font2,
2 + extents1.xOff, 2 + ascent, 2 + extents1.xOff, 2 + ascent,
(char *)string2, strlen (string2)); (unsigned char *)string2, strlen (string2));
XftDrawDestroy (draw); XftDrawDestroy (draw);

7
capplets/keybindings/ChangeLog
View file

@ -1,3 +1,10 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* eggcellrendererkeys.c: (egg_cell_renderer_keys_set_accelerator):
Remove some unused code.
* gnome-keybinding-properties.c: (should_show_key): Mark some
arrays static.
2005-02-08 Sebastien Bacher <seb128@debian.org> 2005-02-08 Sebastien Bacher <seb128@debian.org>
* eggcellrendererkeys.c: (egg_cell_renderer_keys_start_editing): * eggcellrendererkeys.c: (egg_cell_renderer_keys_start_editing):

3
capplets/keybindings/eggcellrendererkeys.c
View file

@ -628,7 +628,6 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
{ {
char *text; char *text;
gboolean changed; gboolean changed;
GtkCellRendererText *celltext;
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
@ -663,12 +662,10 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
if (changed) if (changed)
{ {
/* sync string to the key values */ /* sync string to the key values */
celltext = GTK_CELL_RENDERER_TEXT (keys);
text = convert_keysym_state_to_string (keys->accel_key, keys->keycode, keys->accel_mask); text = convert_keysym_state_to_string (keys->accel_key, keys->keycode, keys->accel_mask);
g_object_set (keys, "text", text, NULL); g_object_set (keys, "text", text, NULL);
g_free (text); g_free (text);
} }
} }
void void

7
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -38,7 +38,7 @@ typedef struct
gint data; gint data;
} KeyListEntry; } KeyListEntry;
const KeyListEntry desktop_key_list[] = static const KeyListEntry desktop_key_list[] =
{ {
{ "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
{ "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
@ -59,7 +59,7 @@ const KeyListEntry desktop_key_list[] =
#endif #endif
{ NULL } { NULL }
}; };
const KeyListEntry sounds_key_list[] = static const KeyListEntry sounds_key_list[] =
{ {
{ "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 },
{ "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 },
@ -74,7 +74,7 @@ const KeyListEntry sounds_key_list[] =
{ NULL } { NULL }
}; };
const KeyListEntry metacity_key_list[] = static const KeyListEntry metacity_key_list[] =
{ {
{ "/apps/metacity/window_keybindings/activate_window_menu", ALWAYS_VISIBLE, 0 }, { "/apps/metacity/window_keybindings/activate_window_menu", ALWAYS_VISIBLE, 0 },
{ "/apps/metacity/window_keybindings/toggle_fullscreen", ALWAYS_VISIBLE, 0 }, { "/apps/metacity/window_keybindings/toggle_fullscreen", ALWAYS_VISIBLE, 0 },
@ -442,7 +442,6 @@ should_show_key (const KeyListEntry *entry)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
break;
} }
return FALSE; return FALSE;

5
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,8 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-keyboard-properties.c: (setup_dialog): Remove unused
code.
2005-10-24 Muktha <muktha.narayan@wipro.com> 2005-10-24 Muktha <muktha.narayan@wipro.com>
Fixes part of #90932 Fixes part of #90932

3
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -127,11 +127,8 @@ setup_dialog (GladeXML *dialog,
GConfChangeSet *changeset) GConfChangeSet *changeset)
{ {
GObject *peditor; GObject *peditor;
GnomeProgram *program;
/* load all the images */ /* load all the images */
program = gnome_program_get ();
capplet_init_stock_icons (); capplet_init_stock_icons ();
peditor = gconf_peditor_new_boolean peditor = gconf_peditor_new_boolean

5
capplets/mouse/ChangeLog
View file

@ -1,3 +1,8 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-mouse-properties.c: (setup_dialog): Mark some code static
and remove some unused code.
2005-10-24 Jens Granseuer <jensgr@gmx.net> 2005-10-24 Jens Granseuer <jensgr@gmx.net>
Fixes #318746 Fixes #318746

7
capplets/mouse/gnome-mouse-properties.c
View file

@ -108,7 +108,7 @@ enum
/* State in testing the double-click speed. Global for a great deal of /* State in testing the double-click speed. Global for a great deal of
* convenience * convenience
*/ */
gint double_click_state = DOUBLE_CLICK_TEST_OFF; static gint double_click_state = DOUBLE_CLICK_TEST_OFF;
/* normalilzation routines */ /* normalilzation routines */
/* All of our scales but double_click are on the range 1->10 as a result, we /* All of our scales but double_click are on the range 1->10 as a result, we
@ -847,16 +847,11 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
GtkCellRenderer *renderer; GtkCellRenderer *renderer;
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GConfValue *value; GConfValue *value;
GnomeProgram *program;
gchar *cursor_font; gchar *cursor_font;
gboolean found_default;
gchar *message; gchar *message;
GConfClient *client = gconf_client_get_default (); GConfClient *client = gconf_client_get_default ();
program = gnome_program_get ();
found_default = FALSE;
/* Buttons page */ /* Buttons page */
/* Left-handed toggle */ /* Left-handed toggle */
peditor = gconf_peditor_new_boolean peditor = gconf_peditor_new_boolean

10
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-theme-details.c: (gnome_theme_details_init),
(gnome_theme_details_reread_themes_from_disk):
Remove some unused code.
* gnome-theme-installer.c: (transfer_done_cb),
(gnome_theme_installer_run): Don't declare variables more often than
needed.
* gnome-theme-manager.c: Mark some code static.
2005-10-24 Ed Catmur <ed@catmur.co.uk> 2005-10-24 Ed Catmur <ed@catmur.co.uk>
Fixes #319358 Fixes #319358

4
capplets/theme-switcher/gnome-theme-details.c
View file

@ -270,7 +270,6 @@ void
gnome_theme_details_init (void) gnome_theme_details_init (void)
{ {
GtkWidget *parent, *widget; GtkWidget *parent, *widget;
GnomeWindowManager *window_manager;
GladeXML *dialog; GladeXML *dialog;
if (theme_details_initted) if (theme_details_initted)
@ -278,7 +277,6 @@ gnome_theme_details_init (void)
theme_details_initted = TRUE; theme_details_initted = TRUE;
dialog = gnome_theme_manager_get_theme_dialog (); dialog = gnome_theme_manager_get_theme_dialog ();
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
parent = WID ("theme_details_dialog"); parent = WID ("theme_details_dialog");
setup_tree_view (GTK_TREE_VIEW (WID ("control_theme_treeview")), setup_tree_view (GTK_TREE_VIEW (WID ("control_theme_treeview")),
@ -359,7 +357,6 @@ gnome_theme_details_reread_themes_from_disk (void)
GList *string_list; GList *string_list;
GList *list; GList *list;
GnomeWindowManager *window_manager; GnomeWindowManager *window_manager;
GtkWidget *notebook;
gboolean have_gtk_theme; gboolean have_gtk_theme;
gboolean have_window_theme; gboolean have_window_theme;
@ -370,7 +367,6 @@ gnome_theme_details_reread_themes_from_disk (void)
dialog = gnome_theme_manager_get_theme_dialog (); dialog = gnome_theme_manager_get_theme_dialog ();
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ())); window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
notebook = WID ("theme_notebook");
/* First, we update the GTK+ themes page */ /* First, we update the GTK+ themes page */
theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2); theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2);

26
capplets/theme-switcher/gnome-theme-installer.c
View file

@ -235,8 +235,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
if ((gnome_vfs_make_directory(theme_props->target_tmp_dir,0700)) != GNOME_VFS_OK) { if ((gnome_vfs_make_directory(theme_props->target_tmp_dir,0700)) != GNOME_VFS_OK) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -255,8 +253,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
if (theme_props->filetype == TARBZ ) { if (theme_props->filetype == TARBZ ) {
if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) { if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -273,8 +269,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
} }
if (!transfer_done_tarbz2_idle_cb(theme_props)) { if (!transfer_done_tarbz2_idle_cb(theme_props)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -293,8 +287,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
if (theme_props->filetype == TARGZ ) { if (theme_props->filetype == TARGZ ) {
if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) { if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -310,8 +302,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
return; return;
} }
if (!transfer_done_targz_idle_cb(theme_props)) { if (!transfer_done_targz_idle_cb(theme_props)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -348,8 +338,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
theme_props->target_dir = g_strdup_printf("%s/.themes/%s",g_get_home_dir(),dir[0]); theme_props->target_dir = g_strdup_printf("%s/.themes/%s",g_get_home_dir(),dir[0]);
theme_props->user_message=g_strdup_printf(_("Controls Theme %s correctly installed.\nYou can select it in the theme details."),dir[0]); theme_props->user_message=g_strdup_printf(_("Controls Theme %s correctly installed.\nYou can select it in the theme details."),dir[0]);
} else if (theme_type == THEME_ENGINE) { } else if (theme_type == THEME_ENGINE) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -365,8 +353,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
g_free (command); g_free (command);
return; return;
} else { } else {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -390,8 +376,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
GNOME_VFS_XFER_ERROR_MODE_ABORT, GNOME_VFS_XFER_ERROR_MODE_ABORT,
GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
NULL,NULL) != GNOME_VFS_OK) { NULL,NULL) != GNOME_VFS_OK) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
@ -409,8 +393,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
g_free (command); g_free (command);
return; return;
} else { } else {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO, GTK_MESSAGE_INFO,
@ -600,15 +582,15 @@ gnome_theme_installer_run (GtkWidget *parent, gchar *filename)
running_theme_install = TRUE; running_theme_install = TRUE;
if (!g_file_test ("/bin/tar", G_FILE_TEST_EXISTS)) { if (!g_file_test ("/bin/tar", G_FILE_TEST_EXISTS)) {
GtkWidget *dialog; GtkWidget *error_dialog;
dialog = gtk_message_dialog_new (NULL, error_dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, GTK_BUTTONS_OK,
_("Cannot install theme.\nThe tar program is not installed on your system.")); _("Cannot install theme.\nThe tar program is not installed on your system."));
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (error_dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (error_dialog);
return; return;
} }

2
capplets/theme-switcher/gnome-theme-manager.c
View file

@ -745,7 +745,7 @@ remove_custom_row_from_meta_theme (void)
custom_meta_theme_info.name = NULL; custom_meta_theme_info.name = NULL;
} }
gboolean static gboolean
themes_equal (GnomeThemeMetaInfo *a, GnomeThemeMetaInfo *b) themes_equal (GnomeThemeMetaInfo *a, GnomeThemeMetaInfo *b)
{ {
if (!a->gtk_theme_name || if (!a->gtk_theme_name ||

4
capplets/windows/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-window-properties.c: (main): Remove unused code.
2005-01-02 Sebastien Bacher <seb128@debian.org> 2005-01-02 Sebastien Bacher <seb128@debian.org>
* gnome-window-properties.glade: * gnome-window-properties.glade:

2
capplets/windows/gnome-window-properties.c
View file

@ -49,7 +49,6 @@ static GtkWidget *autoraise_checkbutton;
static GtkWidget *autoraise_delay_slider; static GtkWidget *autoraise_delay_slider;
static GtkWidget *autoraise_delay_hbox; static GtkWidget *autoraise_delay_hbox;
static GtkWidget *double_click_titlebar_optionmenu; static GtkWidget *double_click_titlebar_optionmenu;
static GtkWidget *double_click_titlebar_hbox;
static GtkWidget *alt_click_hbox; static GtkWidget *alt_click_hbox;
static GnomeWMSettings *settings; static GnomeWMSettings *settings;
@ -453,7 +452,6 @@ main (int argc, char **argv)
autoraise_delay_slider = WID ("autoraise-delay-slider"); autoraise_delay_slider = WID ("autoraise-delay-slider");
autoraise_delay_hbox = WID ("autoraise-delay-hbox"); autoraise_delay_hbox = WID ("autoraise-delay-hbox");
double_click_titlebar_optionmenu = WID ("double-click-titlebar-optionmenu"); double_click_titlebar_optionmenu = WID ("double-click-titlebar-optionmenu");
double_click_titlebar_hbox = WID ("double-click-titlebar-hbox");
alt_click_hbox = WID ("alt-click-box"); alt_click_hbox = WID ("alt-click-box");
gtk_range_set_range (GTK_RANGE (autoraise_delay_slider), gtk_range_set_range (GTK_RANGE (autoraise_delay_slider),

2
configure.in
View file

@ -33,7 +33,7 @@ changequote(,)dnl
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
case " $CFLAGS " in case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;; *[\ \ ]-Wall[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;; *) CFLAGS="$CFLAGS -Wall -Wextra" ;;
esac esac
fi fi
changequote([,])dnl changequote([,])dnl

10
control-center/ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* control-center-categories.c: (populate_category):
* control-center.c: (main):
* gnomecc-canvas.c: (setup_entry), (cb_canvas_event),
(gnomecc_canvas_item_accessible_class_init),
(gnomecc_canvas_accessible_class_init),
(gnomecc_canvas_accessible_add_selection):
* gnomecc-rounded-rect.c: Remove some unused code.
2005-10-25 Carlos Garnacho Parro <carlosg@gnome.org> 2005-10-25 Carlos Garnacho Parro <carlosg@gnome.org>
* control-center-categories.[ch] (control_center_reload_icons): added * control-center-categories.[ch] (control_center_reload_icons): added

1
control-center/control-center-categories.c
View file

@ -179,7 +179,6 @@ populate_category (ControlCenterCategory *category,
g_slist_free (items); g_slist_free (items);
if (entries != NULL) { if (entries != NULL) {
GSList *l;
int i; int i;
category->n_entries = g_slist_length (entries); category->n_entries = g_slist_length (entries);

4
control-center/control-center.c
View file

@ -71,13 +71,11 @@ create_window (void)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
GnomeProgram *ccprogram;
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
ccprogram = gnome_program_init ("gnome-control-center", gnome_program_init ("gnome-control-center",
VERSION, LIBGNOMEUI_MODULE, VERSION, LIBGNOMEUI_MODULE,
argc, argv, argc, argv,
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,

18
control-center/gnomecc-canvas.c
View file

@ -223,7 +223,6 @@ gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show)
static void static void
setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry) setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry)
{ {
GnomeccCanvasPrivate *priv;
EntryInfo *ei; EntryInfo *ei;
GtkWidget *widget; GtkWidget *widget;
GtkStateType state; GtkStateType state;
@ -231,7 +230,6 @@ setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry)
if (!entry) if (!entry)
return; return;
priv = GNOMECC_CANVAS_GET_PRIVATE (canvas);
widget = GTK_WIDGET (canvas); widget = GTK_WIDGET (canvas);
ei = entry->user_data; ei = entry->user_data;
@ -360,7 +358,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas)
GnomeccCanvasPrivate *priv; GnomeccCanvasPrivate *priv;
EntryInfo *ei = NULL; EntryInfo *ei = NULL;
gint n_category, n_entry; gint n_category, n_entry;
gint n_categories, n_entries;
priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); priv = GNOMECC_CANVAS_GET_PRIVATE (canvas);
@ -377,8 +374,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas)
n_entry = 0; n_entry = 0;
n_category = 0; n_category = 0;
n_categories = priv->info->n_categories;
n_entries = priv->info->categories[ei->n_category]->n_entries;
switch (event->key.keyval) { switch (event->key.keyval) {
case GDK_KP_Right: case GDK_KP_Right:
@ -441,7 +436,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas)
activate_entry (priv->selected); activate_entry (priv->selected);
return TRUE; return TRUE;
break;
case GDK_Escape: case GDK_Escape:
gtk_main_quit (); gtk_main_quit ();
return TRUE; return TRUE;
@ -1237,12 +1231,8 @@ gnomecc_canvas_item_accessible_ref_state_set (AtkObject *object)
static void static void
gnomecc_canvas_item_accessible_class_init (AtkObjectClass *class) gnomecc_canvas_item_accessible_class_init (AtkObjectClass *class)
{ {
GObjectClass *object_class;
accessible_item_parent_class = g_type_class_peek_parent (class); accessible_item_parent_class = g_type_class_peek_parent (class);
object_class = (GObjectClass *)class;
class->get_index_in_parent = gnomecc_canvas_item_accessible_get_index_in_parent; class->get_index_in_parent = gnomecc_canvas_item_accessible_get_index_in_parent;
class->get_name = gnomecc_canvas_item_accessible_get_name; class->get_name = gnomecc_canvas_item_accessible_get_name;
class->get_parent = gnomecc_canvas_item_accessible_get_parent; class->get_parent = gnomecc_canvas_item_accessible_get_parent;
@ -1399,14 +1389,8 @@ gnomecc_canvas_accessible_initialize (AtkObject *accessible, gpointer data)
static void static void
gnomecc_canvas_accessible_class_init (AtkObjectClass *class) gnomecc_canvas_accessible_class_init (AtkObjectClass *class)
{ {
GObjectClass *object_class;
GtkAccessibleClass *accessible_class;
accessible_parent_class = g_type_class_peek_parent (class); accessible_parent_class = g_type_class_peek_parent (class);
object_class = (GObjectClass *)class;
accessible_class = (GtkAccessibleClass *)class;
class->get_n_children = gnomecc_canvas_accessible_get_n_children; class->get_n_children = gnomecc_canvas_accessible_get_n_children;
class->ref_child = gnomecc_canvas_accessible_ref_child; class->ref_child = gnomecc_canvas_accessible_ref_child;
class->initialize = gnomecc_canvas_accessible_initialize; class->initialize = gnomecc_canvas_accessible_initialize;
@ -1415,7 +1399,6 @@ gnomecc_canvas_accessible_class_init (AtkObjectClass *class)
static gboolean static gboolean
gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i) gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i)
{ {
GnomeccCanvasPrivate *priv;
GnomeccCanvas *canvas; GnomeccCanvas *canvas;
GtkWidget *widget; GtkWidget *widget;
ControlCenterEntry *entry; ControlCenterEntry *entry;
@ -1426,7 +1409,6 @@ gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i)
return FALSE; return FALSE;
canvas = GNOMECC_CANVAS (widget); canvas = GNOMECC_CANVAS (widget);
priv = GNOMECC_CANVAS_GET_PRIVATE (canvas);
entry = gnomecc_canvas_accessible_get_entry (canvas, i); entry = gnomecc_canvas_accessible_get_entry (canvas, i);
select_entry (canvas, entry); select_entry (canvas, entry);

2
control-center/gnomecc-rounded-rect.c
View file

@ -33,7 +33,7 @@ typedef GnomeCanvasRectClass GnomeccRoundedRectClass;
#define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, GnomeccRoundedRectClass)) #define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, GnomeccRoundedRectClass))
#define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) #define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT))
G_DEFINE_TYPE (GnomeccRoundedRect, gnomecc_rounded_rect, GNOME_TYPE_CANVAS_RECT); G_DEFINE_TYPE (GnomeccRoundedRect, gnomecc_rounded_rect, GNOME_TYPE_CANVAS_RECT)
/************************************************************************* /*************************************************************************
* Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c

17
gnome-settings-daemon/ChangeLog
View file

@ -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> 2005-10-21 Ray Strode <rstrode@redhat.com>
Remap buttons on auxillary mice for left-handed Remap buttons on auxillary mice for left-handed

4
gnome-settings-daemon/actions/acme-volume-dummy.c
View file

@ -31,13 +31,9 @@ static void acme_volume_dummy_set_volume (AcmeVolume *self, int val);
static void static void
acme_volume_dummy_finalize (GObject *object) acme_volume_dummy_finalize (GObject *object)
{ {
AcmeVolumeDummy *self;
g_return_if_fail (object != NULL); g_return_if_fail (object != NULL);
g_return_if_fail (ACME_IS_VOLUME_DUMMY (object)); g_return_if_fail (ACME_IS_VOLUME_DUMMY (object));
self = ACME_VOLUME_DUMMY (object);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }

3
gnome-settings-daemon/actions/acme-volume.c
View file

@ -41,7 +41,7 @@ static void
acme_volume_class_init (AcmeVolumeClass *klass) acme_volume_class_init (AcmeVolumeClass *klass)
{ {
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
}; }
static void static void
acme_volume_init (AcmeVolume *vol) 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)); vol = ACME_VOLUME (g_object_new (acme_volume_oss_get_type (), NULL));
return vol; return vol;
#endif #endif
return ACME_VOLUME (g_object_new (acme_volume_dummy_get_type (), NULL));
} }

4
gnome-settings-daemon/clipboard-manager.c
View file

@ -165,13 +165,10 @@ clipboard_bytes_per_item (int format)
{ {
case 8: case 8:
return sizeof (char); return sizeof (char);
break;
case 16: case 16:
return sizeof (short); return sizeof (short);
break;
case 32: case 32:
return sizeof (long); return sizeof (long);
break;
default: ; default: ;
} }
return 0; return 0;
@ -703,7 +700,6 @@ clipboard_manager_process_event (ClipboardManager *manager,
return receive_incrementally (manager, xev); return receive_incrementally (manager, xev);
else else
return send_incrementally (manager, xev); return send_incrementally (manager, xev);
break;
case SelectionClear: case SelectionClear:
if (xev->xany.window != manager->window) if (xev->xany.window != manager->window)

33
gnome-settings-daemon/gnome-settings-daemon.c
View file

@ -214,7 +214,7 @@ manager_event_filter (GdkXEvent *xevent,
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
CORBA_boolean static CORBA_boolean
awake_impl (PortableServer_Servant servant, awake_impl (PortableServer_Servant servant,
const CORBA_char *service, const CORBA_char *service,
CORBA_Environment *ev) CORBA_Environment *ev)
@ -416,34 +416,6 @@ gnome_settings_daemon_new (void)
/* Helper functions */ /* 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 static void
child_watch_cb (GPid pid, gint status, gpointer user_data) child_watch_cb (GPid pid, gint status, gpointer user_data)
{ {
@ -500,7 +472,6 @@ void
gnome_settings_daemon_spawn_with_input (char **argv, gnome_settings_daemon_spawn_with_input (char **argv,
const char *input) const char *input)
{ {
int exit_status;
int child_pid; int child_pid;
int inpipe; int inpipe;
GError *err = NULL; GError *err = NULL;
@ -513,7 +484,7 @@ gnome_settings_daemon_spawn_with_input (char **argv,
&inpipe, NULL, NULL, /* stdin, stdout, stderr */ &inpipe, NULL, NULL, /* stdin, stdout, stderr */
&err)) &err))
{ {
gchar *command = g_strjoinv (" ", argv); command = g_strjoinv (" ", argv);
g_warning ("Could not execute %s: %s", command, err->message); g_warning ("Could not execute %s: %s", command, err->message);
g_error_free (err); g_error_free (err);
g_free (command); g_free (command);

4
gnome-settings-daemon/gnome-settings-default-editor.c
View file

@ -32,7 +32,7 @@
static gboolean sync_changes; static gboolean sync_changes;
#if DE_DEBUG #ifdef DE_DEBUG
static void static void
print_mime_app (const char *mime_type) print_mime_app (const char *mime_type)
{ {
@ -106,7 +106,7 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client)
return; return;
} }
#if DE_DEBUG #ifdef DE_DEBUG
g_message ("Synching text/plain to text/*..."); g_message ("Synching text/plain to text/*...");
#endif #endif

10
gnome-settings-daemon/gnome-settings-keybindings.c
View file

@ -104,7 +104,7 @@ screen_exec_display_string (GdkScreen *screen)
* mainly ripped from egg_screen_exec_display_string in * mainly ripped from egg_screen_exec_display_string in
* gnome-panel/egg-screen-exec.c * gnome-panel/egg-screen-exec.c
**/ **/
char ** static char **
get_exec_environment (XEvent *xevent) get_exec_environment (XEvent *xevent)
{ {
char **retval = NULL; char **retval = NULL;
@ -169,7 +169,7 @@ parse_binding (Binding *binding)
return TRUE; return TRUE;
} }
gboolean static gboolean
bindings_get_entry (char *subdir) bindings_get_entry (char *subdir)
{ {
GConfValue *value; GConfValue *value;
@ -289,7 +289,7 @@ grab_key (GdkWindow *root, Key *key, int result, gboolean grab)
gdk_flush (); gdk_flush ();
if (gdk_error_trap_pop ()) { if (gdk_error_trap_pop ()) {
g_warning (_("It seems that another application already has" 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) binding_register_keys (void)
{ {
GSList *li; GSList *li;
@ -380,7 +380,7 @@ bindings_callback (GConfEntry *entry)
binding_register_keys (); binding_register_keys ();
} }
GdkFilterReturn static GdkFilterReturn
keybindings_filter (GdkXEvent *gdk_xevent, keybindings_filter (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)

4
gnome-settings-daemon/gnome-settings-typing-break.c
View file

@ -6,8 +6,8 @@
#include "reaper.h" #include "reaper.h"
#include <string.h> #include <string.h>
pid_t typing_monitor_pid = 0; static pid_t typing_monitor_pid = 0;
guint typing_monitor_idle_id = 0; static guint typing_monitor_idle_id = 0;
static gboolean static gboolean
typing_break_timeout (gpointer data) typing_break_timeout (gpointer data)

4
gnome-settings-daemon/gnome-settings-xrdb.c
View file

@ -40,7 +40,7 @@
#define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme" #define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme"
GtkWidget *widget; static GtkWidget *widget;
/* /*
* Theme colour functions * Theme colour functions
@ -171,8 +171,6 @@ scan_ad_directory (const char *path, GError **error)
return NULL; return NULL;
} }
while ((entry = g_dir_read_name (dir)) != NULL) { while ((entry = g_dir_read_name (dir)) != NULL) {
int len;
len = strlen (entry);
if (g_str_has_suffix (entry, ".ad")) { if (g_str_has_suffix (entry, ".ad")) {
list = g_slist_prepend (list, g_strdup_printf ("%s/%s", path, entry)); list = g_slist_prepend (list, g_strdup_printf ("%s/%s", path, entry));
} }

9
gnome-settings-daemon/gnome-settings-xsettings.c
View file

@ -164,32 +164,23 @@ type_to_string (GConfValueType type)
{ {
case GCONF_VALUE_INT: case GCONF_VALUE_INT:
return "int"; return "int";
break;
case GCONF_VALUE_STRING: case GCONF_VALUE_STRING:
return "string"; return "string";
break;
case GCONF_VALUE_FLOAT: case GCONF_VALUE_FLOAT:
return "float"; return "float";
break;
case GCONF_VALUE_BOOL: case GCONF_VALUE_BOOL:
return "bool"; return "bool";
break;
case GCONF_VALUE_SCHEMA: case GCONF_VALUE_SCHEMA:
return "schema"; return "schema";
break;
case GCONF_VALUE_LIST: case GCONF_VALUE_LIST:
return "list"; return "list";
break;
case GCONF_VALUE_PAIR: case GCONF_VALUE_PAIR:
return "pair"; return "pair";
break;
case GCONF_VALUE_INVALID: case GCONF_VALUE_INVALID:
return "*invalid*"; return "*invalid*";
break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
return NULL; /* for warnings */ return NULL; /* for warnings */
break;
} }
} }

6
gnome-settings-daemon/xsettings-manager.c
View file

@ -45,7 +45,7 @@ struct _XSettingsManager
unsigned long serial; unsigned long serial;
}; };
XSettingsList *settings; static XSettingsList *settings;
typedef struct typedef struct
{ {
@ -295,7 +295,7 @@ xsettings_manager_set_color (XSettingsManager *manager,
return xsettings_manager_set_setting (manager, &setting); return xsettings_manager_set_setting (manager, &setting);
} }
size_t static size_t
setting_length (XSettingsSetting *setting) setting_length (XSettingsSetting *setting)
{ {
size_t length = 8; /* type + pad + name-len + last-change-serial */ size_t length = 8; /* type + pad + name-len + last-change-serial */
@ -317,7 +317,7 @@ setting_length (XSettingsSetting *setting)
return length; return length;
} }
void static void
setting_store (XSettingsSetting *setting, setting_store (XSettingsSetting *setting,
XSettingsBuffer *buffer) XSettingsBuffer *buffer)
{ {

5
libwindow-settings/ChangeLog
View file

@ -1,3 +1,8 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* gnome-window-manager.c: (gnome_window_manager_class_init):
Remove some unused code.
2005-07-19 Mark McLoughlin <mark@skynet.ie> 2005-07-19 Mark McLoughlin <mark@skynet.ie>
See http://mail.gnome.org/archives/desktop-devel-list/2005-July/msg00341.html See http://mail.gnome.org/archives/desktop-devel-list/2005-July/msg00341.html

2
libwindow-settings/gnome-window-manager.c
View file

@ -181,10 +181,8 @@ static void
gnome_window_manager_class_init (GnomeWindowManagerClass *class) gnome_window_manager_class_init (GnomeWindowManagerClass *class)
{ {
GObjectClass *object_class; GObjectClass *object_class;
GnomeWindowManagerClass *wm_class;
object_class = G_OBJECT_CLASS (class); object_class = G_OBJECT_CLASS (class);
wm_class = GNOME_WINDOW_MANAGER_CLASS (class);
object_class->finalize = gnome_window_manager_finalize; object_class->finalize = gnome_window_manager_finalize;

4
typing-break/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* drw-selection.h: ANSIfy function declaration.
2005-10-07 Rodrigo Moya <rodrigo@novell.com> 2005-10-07 Rodrigo Moya <rodrigo@novell.com>
Fixes #318231 Fixes #318231

2
typing-break/drw-selection.h
View file

@ -26,7 +26,7 @@
typedef struct _DrwSelection DrwSelection; typedef struct _DrwSelection DrwSelection;
DrwSelection * drw_selection_start (); DrwSelection * drw_selection_start (void);
void drw_selection_stop (DrwSelection *drw_selection); void drw_selection_stop (DrwSelection *drw_selection);
gboolean drw_selection_is_master (DrwSelection *drw_selection); gboolean drw_selection_is_master (DrwSelection *drw_selection);

6
vfs-methods/fontilus/ChangeLog
View file

@ -1,3 +1,9 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* font-method.c: (get_pango_name), (do_open):
* ftstream-vfs.c:
* thumbnailer.c: Mark code static and remove unused code.
2005-08-04 Paolo Borelli <pborelli@katamail.com> 2005-08-04 Paolo Borelli <pborelli@katamail.com>
* font-view.c (add_face_info): follow symlinks when getting * font-view.c (add_face_info): follow symlinks when getting

4
vfs-methods/fontilus/font-method.c
View file

@ -100,7 +100,7 @@ get_pango_name(FcPattern *pat)
* if not, remove the comma. */ * if not, remove the comma. */
if (str->str[str->len-1] == ',') { if (str->str[str->len-1] == ',') {
const gchar *lastword; const gchar *lastword;
gint wordlen, i; gint wordlen;
gboolean word_matches; gboolean word_matches;
const char *modifier_words[] = { const char *modifier_words[] = {
"Oblique", "Italic", "Small-Caps", "Ultra-Light", "Light", "Oblique", "Italic", "Small-Caps", "Ultra-Light", "Light",
@ -414,8 +414,6 @@ do_open(GnomeVFSMethod *method,
/* handle the .directory file */ /* handle the .directory file */
if (!strcmp(path, "/.directory")) { if (!strcmp(path, "/.directory")) {
GnomeVFSURI *uri;
uri = gnome_vfs_uri_new(FONT_METHOD_DIRECTORY); uri = gnome_vfs_uri_new(FONT_METHOD_DIRECTORY);
result = gnome_vfs_open_uri_cancellable( result = gnome_vfs_open_uri_cancellable(
(GnomeVFSHandle **)method_handle, uri, mode, context); (GnomeVFSHandle **)method_handle, uri, mode, context);

2
vfs-methods/fontilus/ftstream-vfs.c
View file

@ -26,7 +26,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <libgnomevfs/gnome-vfs.h> #include <libgnomevfs/gnome-vfs.h>
static unsigned long static guint64
vfs_stream_read(FT_Stream stream, vfs_stream_read(FT_Stream stream,
unsigned long offset, unsigned long offset,
unsigned char *buffer, unsigned char *buffer,

2
vfs-methods/fontilus/thumbnailer.c
View file

@ -29,7 +29,7 @@
#include <libgnomevfs/gnome-vfs.h> #include <libgnomevfs/gnome-vfs.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
const gchar * static const gchar *
get_ft_error(FT_Error error) get_ft_error(FT_Error error)
{ {
#undef __FTERRORS_H__ #undef __FTERRORS_H__

4
vfs-methods/themus/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-14 Kjartan Maraas <kmaraas@gnome.org>
* theme-method.c: (do_open): Remove unused var.
2005-09-25 Sebastien Bacher <seb128@debian.org> 2005-09-25 Sebastien Bacher <seb128@debian.org>
* themus-theme-applier.desktop.in.in: * themus-theme-applier.desktop.in.in:

2
vfs-methods/themus/theme-method.c
View file

@ -337,8 +337,6 @@ do_open(GnomeVFSMethod *method,
/* handle the .directory file */ /* handle the .directory file */
if (!strcmp(path, "/.directory")) { if (!strcmp(path, "/.directory")) {
GnomeVFSURI *uri;
uri = gnome_vfs_uri_new(THEME_METHOD_DIRECTORY); uri = gnome_vfs_uri_new(THEME_METHOD_DIRECTORY);
result = gnome_vfs_open_uri_cancellable( result = gnome_vfs_open_uri_cancellable(
(GnomeVFSHandle **)method_handle, uri, mode, context); (GnomeVFSHandle **)method_handle, uri, mode, context);