From 564a9d03aa5898cda7540f952279e768382fbb1d Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Mon, 14 Nov 2005 15:18:09 +0000 Subject: [PATCH] Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. ANSIfy 2005-11-14 Kjartan Maraas * */*: Huge cleanup. Individual ChangeLogs have info. Closing bug #320157. * libkbddraw/keyboard-drawing.h: ANSIfy some function declarations. --- ChangeLog | 6 ++++ .../accessibility/at-properties/ChangeLog | 4 +++ .../at-properties/at-startup-session.c | 2 +- capplets/accessibility/keyboard/ChangeLog | 4 +++ .../keyboard/accessibility-keyboard.c | 1 + capplets/common/ChangeLog | 10 ++++++ capplets/common/capplet-stock-icons.c | 2 -- capplets/common/file-transfer-dialog.c | 2 +- capplets/common/gconf-property-editor.c | 8 ++--- capplets/common/gnome-theme-info.c | 2 -- capplets/default-applications/ChangeLog | 5 +++ ...-default-applications-properties-structs.c | 6 ++-- capplets/display/ChangeLog | 4 +++ capplets/display/main.c | 8 ++--- capplets/font/ChangeLog | 4 +++ capplets/font/main.c | 8 ++--- capplets/keybindings/ChangeLog | 7 ++++ capplets/keybindings/eggcellrendererkeys.c | 3 -- .../keybindings/gnome-keybinding-properties.c | 7 ++-- capplets/keyboard/ChangeLog | 5 +++ capplets/keyboard/gnome-keyboard-properties.c | 3 -- capplets/mouse/ChangeLog | 5 +++ capplets/mouse/gnome-mouse-properties.c | 9 ++--- capplets/theme-switcher/ChangeLog | 10 ++++++ capplets/theme-switcher/gnome-theme-details.c | 4 --- .../theme-switcher/gnome-theme-installer.c | 26 +++------------ capplets/theme-switcher/gnome-theme-manager.c | 2 +- capplets/windows/ChangeLog | 4 +++ capplets/windows/gnome-window-properties.c | 2 -- configure.in | 2 +- control-center/ChangeLog | 10 ++++++ control-center/control-center-categories.c | 1 - control-center/control-center.c | 4 +-- control-center/gnomecc-canvas.c | 18 ---------- control-center/gnomecc-rounded-rect.c | 2 +- gnome-settings-daemon/ChangeLog | 17 ++++++++++ .../actions/acme-volume-dummy.c | 4 --- gnome-settings-daemon/actions/acme-volume.c | 3 +- gnome-settings-daemon/clipboard-manager.c | 4 --- gnome-settings-daemon/gnome-settings-daemon.c | 33 ++----------------- .../gnome-settings-default-editor.c | 4 +-- .../gnome-settings-keybindings.c | 10 +++--- .../gnome-settings-typing-break.c | 4 +-- gnome-settings-daemon/gnome-settings-xrdb.c | 4 +-- .../gnome-settings-xsettings.c | 9 ----- gnome-settings-daemon/xsettings-manager.c | 6 ++-- libwindow-settings/ChangeLog | 5 +++ libwindow-settings/gnome-window-manager.c | 2 -- typing-break/ChangeLog | 4 +++ typing-break/drw-selection.h | 2 +- vfs-methods/fontilus/ChangeLog | 6 ++++ vfs-methods/fontilus/font-method.c | 4 +-- vfs-methods/fontilus/ftstream-vfs.c | 2 +- vfs-methods/fontilus/thumbnailer.c | 2 +- vfs-methods/themus/ChangeLog | 4 +++ vfs-methods/themus/theme-method.c | 2 -- 56 files changed, 165 insertions(+), 166 deletions(-) diff --git a/ChangeLog b/ChangeLog index f68d15bf7..048920427 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-14 Kjartan Maraas + + * */*: Huge cleanup. Individual ChangeLogs have info. + Closing bug #320157. + * libkbddraw/keyboard-drawing.h: ANSIfy some function declarations. + 2005-10-31 Jürg Billeter reviewed by: Rodrigo Moya diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog index 0d08f7cc3..512fc6591 100644 --- a/capplets/accessibility/at-properties/ChangeLog +++ b/capplets/accessibility/at-properties/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * at-startup-session.c: Mark at_startup_string_compare() static. + 2004-11-09 Mark McLoughlin * Makefile.am: install the .desktop file in diff --git a/capplets/accessibility/at-properties/at-startup-session.c b/capplets/accessibility/at-properties/at-startup-session.c index 31026204e..2f1f7197e 100644 --- a/capplets/accessibility/at-properties/at-startup-session.c +++ b/capplets/accessibility/at-properties/at-startup-session.c @@ -26,7 +26,7 @@ at_startup_get_list (GConfClient *client) return at_list; } -gint +static gint at_startup_string_compare (gconstpointer s1, gconstpointer s2) { if (s1 && s2) { diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog index c445e48c1..1c0fa1bf0 100644 --- a/capplets/accessibility/keyboard/ChangeLog +++ b/capplets/accessibility/keyboard/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * accessibility-keyboard.c: Add #include "accessibility-keyboard.h". + 2005-08-14 Sebastien Bacher * accessibility-keyboard.c: (setup_ranges): diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c index 519d15f29..539516787 100644 --- a/capplets/accessibility/keyboard/accessibility-keyboard.c +++ b/capplets/accessibility/keyboard/accessibility-keyboard.c @@ -25,6 +25,7 @@ # include #endif +#include "accessibility-keyboard.h" #include #include #include diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 620a93dd3..54464e181 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,13 @@ +2005-11-14 Kjartan Maraas + + * 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 * gnome-theme-info.h: diff --git a/capplets/common/capplet-stock-icons.c b/capplets/common/capplet-stock-icons.c index 7e8ee4591..af6da0eba 100644 --- a/capplets/common/capplet-stock-icons.c +++ b/capplets/common/capplet-stock-icons.c @@ -80,10 +80,8 @@ capplet_register_stock_icons (GtkIconFactory *factory) { gint i; GtkIconSource *source; - GnomeProgram *program; source = gtk_icon_source_new (); - program = gnome_program_get (); for (i = 0; i < G_N_ELEMENTS (items); ++i) { GtkIconSet *icon_set; diff --git a/capplets/common/file-transfer-dialog.c b/capplets/common/file-transfer-dialog.c index b6cf731b2..ef3180151 100644 --- a/capplets/common/file-transfer-dialog.c +++ b/capplets/common/file-transfer-dialog.c @@ -91,7 +91,7 @@ file_transfer_dialog_finalize (GObject *obj) static void 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); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (dlg->priv->progress), str); g_free (str); diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c index 034a09cf8..08617d0ea 100644 --- a/capplets/common/gconf-property-editor.c +++ b/capplets/common/gconf-property-editor.c @@ -1447,7 +1447,7 @@ gconf_peditor_new_enum_toggle (GConfChangeSet *changeset, return G_OBJECT (peditor); } -gboolean +static gboolean peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename) { GdkPixbuf *pixbuf = NULL; @@ -1523,7 +1523,7 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename) return TRUE; } -void +static void peditor_image_chooser_response_cb (GtkWidget *chooser, gint response, GConfPropertyEditor *peditor) @@ -1561,7 +1561,7 @@ peditor_image_chooser_response_cb (GtkWidget *chooser, gtk_widget_destroy (chooser); } -void +static void peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser, GtkImage *preview) { @@ -1582,7 +1582,7 @@ peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser, gdk_pixbuf_unref (pixbuf); } -void +static void peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button) { GConfValue *value = NULL, *value_wid; diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c index 40c570e49..2bc9b11a6 100644 --- a/capplets/common/gnome-theme-info.c +++ b/capplets/common/gnome-theme-info.c @@ -964,7 +964,6 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle, else if (event_type == GNOME_VFS_MONITOR_EVENT_DELETED) { gchar *name; - CommonThemeDirMonitorData *monitor_data; name = gnome_vfs_uri_extract_short_name (common_theme_dir_uri); 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) { gchar *name; - CommonIconThemeDirMonitorData *monitor_data; name = gnome_vfs_uri_extract_short_name (common_icon_theme_dir_uri); monitor_data = g_hash_table_lookup (handle_hash, name); diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index f7688ab3b..7c9bbac06 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,8 @@ +2005-11-14 Kjartan Maraas + + * gnome-default-applications-properties-structs.c: Mark the + structs static. + 2005-10-20 Colin Leroy * gnome-default-applications-properties-structs.c: added diff --git a/capplets/default-applications/gnome-default-applications-properties-structs.c b/capplets/default-applications/gnome-default-applications-properties-structs.c index 914aa1563..11f4406b8 100644 --- a/capplets/default-applications/gnome-default-applications-properties-structs.c +++ b/capplets/default-applications/gnome-default-applications-properties-structs.c @@ -5,7 +5,7 @@ struct _BrowserDescription { gboolean needs_term; gboolean in_path; }; -BrowserDescription possible_browsers[] = { +static BrowserDescription possible_browsers[] = { { N_("Debian Sensible Browser"), "sensible-browser", "sensible-browser %s", FALSE, FALSE }, { N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE }, { N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE }, @@ -28,7 +28,7 @@ struct _MailerDescription { gboolean needs_term; gboolean in_path; }; -MailerDescription possible_mailers[] = { +static MailerDescription possible_mailers[] = { /* The code in gnome-default-applications-properties.c makes sure * there is only one (the first entry in this list) Evolution entry * in the list shown to the user @@ -55,7 +55,7 @@ struct _TerminalDesciption { gchar const *exec_arg; gboolean in_path; }; -TerminalDescription possible_terminals[] = { +static TerminalDescription possible_terminals[] = { { N_("Debian Terminal Emulator"), "x-terminal-emulator", "-e", FALSE }, { N_("GNOME Terminal"), "gnome-terminal", "-x", FALSE }, { N_("Standard XTerminal"), "xterm", "-e", FALSE }, diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog index 0a51661d5..ac5155abf 100644 --- a/capplets/display/ChangeLog +++ b/capplets/display/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * main.c: Mark some functions static. + 2005-07-20 Rodrigo Moya * main.c (get_screensaver_command): new function to get the correct diff --git a/capplets/display/main.c b/capplets/display/main.c index b1b8a63bd..5d4177292 100644 --- a/capplets/display/main.c +++ b/capplets/display/main.c @@ -44,7 +44,7 @@ struct DisplayInfo { static void generate_rate_menu (struct ScreenInfo *screen_info); static void generate_resolution_menu(struct ScreenInfo* screen_info); -struct DisplayInfo * +static struct DisplayInfo * read_display_info (GdkDisplay *display) { struct DisplayInfo *info; @@ -77,7 +77,7 @@ read_display_info (GdkDisplay *display) return info; } -void +static void update_display_info (struct DisplayInfo *info, GdkDisplay *display) { struct ScreenInfo *screen_info; @@ -586,13 +586,13 @@ struct TimeoutData { gboolean timed_out; }; -char * +static char * 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); } -gboolean +static gboolean save_timeout_callback (gpointer _data) { struct TimeoutData *data = _data; diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index aff40d8b0..675cf243d 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * main.c: (setup_font_sample): Fix compiler warnings. + 2005-05-22 Sebastien Bacher * font-properties.glade: diff --git a/capplets/font/main.c b/capplets/font/main.c index 636ac932e..9d9c4d96a 100644 --- a/capplets/font/main.c +++ b/capplets/font/main.c @@ -232,9 +232,9 @@ setup_font_sample (GtkWidget *darea, FcPatternDestroy (pattern); if (font1) - XftTextExtentsUtf8 (xdisplay, font1, (char *)string1, strlen (string1), &extents1); + XftTextExtentsUtf8 (xdisplay, font1, (unsigned char *)string1, strlen (string1), &extents1); if (font2) - XftTextExtentsUtf8 (xdisplay, font2, (char *)string2, strlen (string2), &extents2); + XftTextExtentsUtf8 (xdisplay, font2, (unsigned char *)string2, strlen (string2), &extents2); ascent = 0; if (font1) @@ -271,11 +271,11 @@ setup_font_sample (GtkWidget *darea, if (font1) XftDrawStringUtf8 (draw, &black, font1, 2, 2 + ascent, - (char *)string1, strlen (string1)); + (unsigned char *)string1, strlen (string1)); if (font2) XftDrawStringUtf8 (draw, &black, font2, 2 + extents1.xOff, 2 + ascent, - (char *)string2, strlen (string2)); + (unsigned char *)string2, strlen (string2)); XftDrawDestroy (draw); diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index c2b347f53..4893cd0b7 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,10 @@ +2005-11-14 Kjartan Maraas + + * 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 * eggcellrendererkeys.c: (egg_cell_renderer_keys_start_editing): diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 7d56e7c27..c52caef63 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -628,7 +628,6 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, { char *text; gboolean changed; - GtkCellRendererText *celltext; g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); @@ -663,12 +662,10 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, if (changed) { /* 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); g_object_set (keys, "text", text, NULL); g_free (text); } - } void diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 72d81f5e5..6a8886212 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -38,7 +38,7 @@ typedef struct gint data; } 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/power", ALWAYS_VISIBLE, 0 }, @@ -59,7 +59,7 @@ const KeyListEntry desktop_key_list[] = #endif { 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_down", ALWAYS_VISIBLE, 0 }, @@ -74,7 +74,7 @@ const KeyListEntry sounds_key_list[] = { 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/toggle_fullscreen", ALWAYS_VISIBLE, 0 }, @@ -442,7 +442,6 @@ should_show_key (const KeyListEntry *entry) return TRUE; else return FALSE; - break; } return FALSE; diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 404f75740..42f1bc6b2 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2005-11-14 Kjartan Maraas + + * gnome-keyboard-properties.c: (setup_dialog): Remove unused + code. + 2005-10-24 Muktha Fixes part of #90932 diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index ef9a108bd..f278dc6cf 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -127,11 +127,8 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset) { GObject *peditor; - GnomeProgram *program; /* load all the images */ - program = gnome_program_get (); - capplet_init_stock_icons (); peditor = gconf_peditor_new_boolean diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index e60befe67..cf52c1edf 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,8 @@ +2005-11-14 Kjartan Maraas + + * gnome-mouse-properties.c: (setup_dialog): Mark some code static + and remove some unused code. + 2005-10-24 Jens Granseuer Fixes #318746 diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index 95df40a95..709bc644e 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -108,7 +108,7 @@ enum /* State in testing the double-click speed. Global for a great deal of * convenience */ -gint double_click_state = DOUBLE_CLICK_TEST_OFF; +static gint double_click_state = DOUBLE_CLICK_TEST_OFF; /* normalilzation routines */ /* 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; GtkTreeViewColumn *column; GConfValue *value; - GnomeProgram *program; gchar *cursor_font; - gboolean found_default; gchar *message; GConfClient *client = gconf_client_get_default (); - program = gnome_program_get (); - found_default = FALSE; - /* Buttons page */ /* Left-handed toggle */ peditor = gconf_peditor_new_boolean @@ -888,7 +883,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset) /* Cursors page */ tree_view = WID ("cursor_tree"); cursor_font = read_cursor_font (); - + model = (GtkTreeModel *) gtk_list_store_new (N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); model = (GtkTreeModel *) gtk_tree_model_sort_new_with_model (model); gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 8cb2f8bbc..4807545ca 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,13 @@ +2005-11-14 Kjartan Maraas + + * 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 Fixes #319358 diff --git a/capplets/theme-switcher/gnome-theme-details.c b/capplets/theme-switcher/gnome-theme-details.c index 6dd4732a3..ca4ee0ae0 100644 --- a/capplets/theme-switcher/gnome-theme-details.c +++ b/capplets/theme-switcher/gnome-theme-details.c @@ -270,7 +270,6 @@ void gnome_theme_details_init (void) { GtkWidget *parent, *widget; - GnomeWindowManager *window_manager; GladeXML *dialog; if (theme_details_initted) @@ -278,7 +277,6 @@ gnome_theme_details_init (void) theme_details_initted = TRUE; 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"); 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 *list; GnomeWindowManager *window_manager; - GtkWidget *notebook; gboolean have_gtk_theme; gboolean have_window_theme; @@ -370,7 +367,6 @@ gnome_theme_details_reread_themes_from_disk (void) dialog = gnome_theme_manager_get_theme_dialog (); 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 */ theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2); diff --git a/capplets/theme-switcher/gnome-theme-installer.c b/capplets/theme-switcher/gnome-theme-installer.c index 4d4cc0104..2925335c9 100644 --- a/capplets/theme-switcher/gnome-theme-installer.c +++ b/capplets/theme-switcher/gnome-theme-installer.c @@ -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) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -255,8 +253,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) if (theme_props->filetype == TARBZ ) { if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -273,8 +269,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) } if (!transfer_done_tarbz2_idle_cb(theme_props)) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -293,8 +287,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) if (theme_props->filetype == TARGZ ) { if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -310,8 +302,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) return; } if (!transfer_done_targz_idle_cb(theme_props)) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, 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->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) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -365,8 +353,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) g_free (command); return; } else { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -390,8 +376,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) GNOME_VFS_XFER_ERROR_MODE_ABORT, GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, NULL,NULL) != GNOME_VFS_OK) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -409,8 +393,6 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) g_free (command); return; } else { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, @@ -600,15 +582,15 @@ gnome_theme_installer_run (GtkWidget *parent, gchar *filename) running_theme_install = TRUE; 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_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Cannot install theme.\nThe tar program is not installed on your system.")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run (GTK_DIALOG (error_dialog)); + gtk_widget_destroy (error_dialog); return; } diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index 4494ab88f..d9f941bcc 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -745,7 +745,7 @@ remove_custom_row_from_meta_theme (void) custom_meta_theme_info.name = NULL; } -gboolean +static gboolean themes_equal (GnomeThemeMetaInfo *a, GnomeThemeMetaInfo *b) { if (!a->gtk_theme_name || diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index fc336f4cf..08586ca1e 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * gnome-window-properties.c: (main): Remove unused code. + 2005-01-02 Sebastien Bacher * gnome-window-properties.glade: diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c index 9f3725f55..cd9705dd3 100644 --- a/capplets/windows/gnome-window-properties.c +++ b/capplets/windows/gnome-window-properties.c @@ -49,7 +49,6 @@ static GtkWidget *autoraise_checkbutton; static GtkWidget *autoraise_delay_slider; static GtkWidget *autoraise_delay_hbox; static GtkWidget *double_click_titlebar_optionmenu; -static GtkWidget *double_click_titlebar_hbox; static GtkWidget *alt_click_hbox; static GnomeWMSettings *settings; @@ -453,7 +452,6 @@ main (int argc, char **argv) autoraise_delay_slider = WID ("autoraise-delay-slider"); autoraise_delay_hbox = WID ("autoraise-delay-hbox"); 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"); gtk_range_set_range (GTK_RANGE (autoraise_delay_slider), diff --git a/configure.in b/configure.in index 1374d740b..fcb14086b 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ changequote(,)dnl if test "x$GCC" = "xyes"; then case " $CFLAGS " in *[\ \ ]-Wall[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wall" ;; + *) CFLAGS="$CFLAGS -Wall -Wextra" ;; esac fi changequote([,])dnl diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 8fe6855a1..408ee685e 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,13 @@ +2005-11-14 Kjartan Maraas + + * 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 * control-center-categories.[ch] (control_center_reload_icons): added diff --git a/control-center/control-center-categories.c b/control-center/control-center-categories.c index 1bacb2703..ee0a2e11c 100644 --- a/control-center/control-center-categories.c +++ b/control-center/control-center-categories.c @@ -179,7 +179,6 @@ populate_category (ControlCenterCategory *category, g_slist_free (items); if (entries != NULL) { - GSList *l; int i; category->n_entries = g_slist_length (entries); diff --git a/control-center/control-center.c b/control-center/control-center.c index 3b39be840..44aec033e 100644 --- a/control-center/control-center.c +++ b/control-center/control-center.c @@ -71,13 +71,11 @@ create_window (void) int main (int argc, char *argv[]) { - GnomeProgram *ccprogram; - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ccprogram = gnome_program_init ("gnome-control-center", + gnome_program_init ("gnome-control-center", VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, diff --git a/control-center/gnomecc-canvas.c b/control-center/gnomecc-canvas.c index cbde2e18b..f83f1fe51 100644 --- a/control-center/gnomecc-canvas.c +++ b/control-center/gnomecc-canvas.c @@ -223,7 +223,6 @@ gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) static void setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry) { - GnomeccCanvasPrivate *priv; EntryInfo *ei; GtkWidget *widget; GtkStateType state; @@ -231,7 +230,6 @@ setup_entry (GnomeccCanvas *canvas, ControlCenterEntry *entry) if (!entry) return; - priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); widget = GTK_WIDGET (canvas); ei = entry->user_data; @@ -360,7 +358,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) GnomeccCanvasPrivate *priv; EntryInfo *ei = NULL; gint n_category, n_entry; - gint n_categories, n_entries; priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); @@ -377,8 +374,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) n_entry = 0; n_category = 0; - n_categories = priv->info->n_categories; - n_entries = priv->info->categories[ei->n_category]->n_entries; switch (event->key.keyval) { case GDK_KP_Right: @@ -441,7 +436,6 @@ cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, GnomeccCanvas *canvas) activate_entry (priv->selected); return TRUE; - break; case GDK_Escape: gtk_main_quit (); return TRUE; @@ -1237,12 +1231,8 @@ gnomecc_canvas_item_accessible_ref_state_set (AtkObject *object) static void gnomecc_canvas_item_accessible_class_init (AtkObjectClass *class) { - GObjectClass *object_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_name = gnomecc_canvas_item_accessible_get_name; class->get_parent = gnomecc_canvas_item_accessible_get_parent; @@ -1399,14 +1389,8 @@ gnomecc_canvas_accessible_initialize (AtkObject *accessible, gpointer data) static void gnomecc_canvas_accessible_class_init (AtkObjectClass *class) { - GObjectClass *object_class; - GtkAccessibleClass *accessible_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->ref_child = gnomecc_canvas_accessible_ref_child; class->initialize = gnomecc_canvas_accessible_initialize; @@ -1415,7 +1399,6 @@ gnomecc_canvas_accessible_class_init (AtkObjectClass *class) static gboolean gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i) { - GnomeccCanvasPrivate *priv; GnomeccCanvas *canvas; GtkWidget *widget; ControlCenterEntry *entry; @@ -1426,7 +1409,6 @@ gnomecc_canvas_accessible_add_selection (AtkSelection *selection, gint i) return FALSE; canvas = GNOMECC_CANVAS (widget); - priv = GNOMECC_CANVAS_GET_PRIVATE (canvas); entry = gnomecc_canvas_accessible_get_entry (canvas, i); select_entry (canvas, entry); diff --git a/control-center/gnomecc-rounded-rect.c b/control-center/gnomecc-rounded-rect.c index a9db3a0c4..0cbd06dbc 100644 --- a/control-center/gnomecc-rounded-rect.c +++ b/control-center/gnomecc-rounded-rect.c @@ -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_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 diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 357d63a88..b164d55ea 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,20 @@ +2005-11-14 Kjartan Maraas + + * 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 Remap buttons on auxillary mice for left-handed diff --git a/gnome-settings-daemon/actions/acme-volume-dummy.c b/gnome-settings-daemon/actions/acme-volume-dummy.c index bd2f87924..74ee0d0bf 100644 --- a/gnome-settings-daemon/actions/acme-volume-dummy.c +++ b/gnome-settings-daemon/actions/acme-volume-dummy.c @@ -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); } diff --git a/gnome-settings-daemon/actions/acme-volume.c b/gnome-settings-daemon/actions/acme-volume.c index 88cd1eab2..ef6082772 100644 --- a/gnome-settings-daemon/actions/acme-volume.c +++ b/gnome-settings-daemon/actions/acme-volume.c @@ -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)); } diff --git a/gnome-settings-daemon/clipboard-manager.c b/gnome-settings-daemon/clipboard-manager.c index 6dd269179..29ec44855 100644 --- a/gnome-settings-daemon/clipboard-manager.c +++ b/gnome-settings-daemon/clipboard-manager.c @@ -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) diff --git a/gnome-settings-daemon/gnome-settings-daemon.c b/gnome-settings-daemon/gnome-settings-daemon.c index 6d53769df..3f37d89bd 100644 --- a/gnome-settings-daemon/gnome-settings-daemon.c +++ b/gnome-settings-daemon/gnome-settings-daemon.c @@ -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); diff --git a/gnome-settings-daemon/gnome-settings-default-editor.c b/gnome-settings-daemon/gnome-settings-default-editor.c index a257fe246..b68dbc8f2 100644 --- a/gnome-settings-daemon/gnome-settings-default-editor.c +++ b/gnome-settings-daemon/gnome-settings-default-editor.c @@ -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 diff --git a/gnome-settings-daemon/gnome-settings-keybindings.c b/gnome-settings-daemon/gnome-settings-keybindings.c index 8c5ed7e47..a90aa2fb5 100644 --- a/gnome-settings-daemon/gnome-settings-keybindings.c +++ b/gnome-settings-daemon/gnome-settings-keybindings.c @@ -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) diff --git a/gnome-settings-daemon/gnome-settings-typing-break.c b/gnome-settings-daemon/gnome-settings-typing-break.c index bb05b8836..008e7cb33 100644 --- a/gnome-settings-daemon/gnome-settings-typing-break.c +++ b/gnome-settings-daemon/gnome-settings-typing-break.c @@ -6,8 +6,8 @@ #include "reaper.h" #include -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) diff --git a/gnome-settings-daemon/gnome-settings-xrdb.c b/gnome-settings-daemon/gnome-settings-xrdb.c index 37a223180..52152d672 100644 --- a/gnome-settings-daemon/gnome-settings-xrdb.c +++ b/gnome-settings-daemon/gnome-settings-xrdb.c @@ -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)); } diff --git a/gnome-settings-daemon/gnome-settings-xsettings.c b/gnome-settings-daemon/gnome-settings-xsettings.c index 07e7c3ef4..6e016ac0a 100644 --- a/gnome-settings-daemon/gnome-settings-xsettings.c +++ b/gnome-settings-daemon/gnome-settings-xsettings.c @@ -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; } } diff --git a/gnome-settings-daemon/xsettings-manager.c b/gnome-settings-daemon/xsettings-manager.c index 98c800c0d..6578ce139 100644 --- a/gnome-settings-daemon/xsettings-manager.c +++ b/gnome-settings-daemon/xsettings-manager.c @@ -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) { diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog index 9420e695b..72b0ae773 100644 --- a/libwindow-settings/ChangeLog +++ b/libwindow-settings/ChangeLog @@ -1,3 +1,8 @@ +2005-11-14 Kjartan Maraas + + * gnome-window-manager.c: (gnome_window_manager_class_init): + Remove some unused code. + 2005-07-19 Mark McLoughlin See http://mail.gnome.org/archives/desktop-devel-list/2005-July/msg00341.html diff --git a/libwindow-settings/gnome-window-manager.c b/libwindow-settings/gnome-window-manager.c index 4240c86e9..cc7a6f35a 100644 --- a/libwindow-settings/gnome-window-manager.c +++ b/libwindow-settings/gnome-window-manager.c @@ -181,10 +181,8 @@ static void gnome_window_manager_class_init (GnomeWindowManagerClass *class) { GObjectClass *object_class; - GnomeWindowManagerClass *wm_class; object_class = G_OBJECT_CLASS (class); - wm_class = GNOME_WINDOW_MANAGER_CLASS (class); object_class->finalize = gnome_window_manager_finalize; diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index 9e125e0c8..fbac50e28 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * drw-selection.h: ANSIfy function declaration. + 2005-10-07 Rodrigo Moya Fixes #318231 diff --git a/typing-break/drw-selection.h b/typing-break/drw-selection.h index 54fd779a3..f384a4e16 100644 --- a/typing-break/drw-selection.h +++ b/typing-break/drw-selection.h @@ -26,7 +26,7 @@ typedef struct _DrwSelection DrwSelection; -DrwSelection * drw_selection_start (); +DrwSelection * drw_selection_start (void); void drw_selection_stop (DrwSelection *drw_selection); gboolean drw_selection_is_master (DrwSelection *drw_selection); diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog index bae1b23ac..e28137f20 100644 --- a/vfs-methods/fontilus/ChangeLog +++ b/vfs-methods/fontilus/ChangeLog @@ -1,3 +1,9 @@ +2005-11-14 Kjartan Maraas + + * 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 * font-view.c (add_face_info): follow symlinks when getting diff --git a/vfs-methods/fontilus/font-method.c b/vfs-methods/fontilus/font-method.c index 2503ba547..cea0b783c 100644 --- a/vfs-methods/fontilus/font-method.c +++ b/vfs-methods/fontilus/font-method.c @@ -100,7 +100,7 @@ get_pango_name(FcPattern *pat) * if not, remove the comma. */ if (str->str[str->len-1] == ',') { const gchar *lastword; - gint wordlen, i; + gint wordlen; gboolean word_matches; const char *modifier_words[] = { "Oblique", "Italic", "Small-Caps", "Ultra-Light", "Light", @@ -414,8 +414,6 @@ do_open(GnomeVFSMethod *method, /* handle the .directory file */ if (!strcmp(path, "/.directory")) { - GnomeVFSURI *uri; - uri = gnome_vfs_uri_new(FONT_METHOD_DIRECTORY); result = gnome_vfs_open_uri_cancellable( (GnomeVFSHandle **)method_handle, uri, mode, context); diff --git a/vfs-methods/fontilus/ftstream-vfs.c b/vfs-methods/fontilus/ftstream-vfs.c index 5864aa828..bd5279b57 100644 --- a/vfs-methods/fontilus/ftstream-vfs.c +++ b/vfs-methods/fontilus/ftstream-vfs.c @@ -26,7 +26,7 @@ #include FT_FREETYPE_H #include -static unsigned long +static guint64 vfs_stream_read(FT_Stream stream, unsigned long offset, unsigned char *buffer, diff --git a/vfs-methods/fontilus/thumbnailer.c b/vfs-methods/fontilus/thumbnailer.c index 3e7759a0a..aebb8ff44 100644 --- a/vfs-methods/fontilus/thumbnailer.c +++ b/vfs-methods/fontilus/thumbnailer.c @@ -29,7 +29,7 @@ #include #include -const gchar * +static const gchar * get_ft_error(FT_Error error) { #undef __FTERRORS_H__ diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog index 463993bae..a28f1da46 100644 --- a/vfs-methods/themus/ChangeLog +++ b/vfs-methods/themus/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Kjartan Maraas + + * theme-method.c: (do_open): Remove unused var. + 2005-09-25 Sebastien Bacher * themus-theme-applier.desktop.in.in: diff --git a/vfs-methods/themus/theme-method.c b/vfs-methods/themus/theme-method.c index 5c4a6ed81..2d52a8eab 100644 --- a/vfs-methods/themus/theme-method.c +++ b/vfs-methods/themus/theme-method.c @@ -337,8 +337,6 @@ do_open(GnomeVFSMethod *method, /* handle the .directory file */ if (!strcmp(path, "/.directory")) { - GnomeVFSURI *uri; - uri = gnome_vfs_uri_new(THEME_METHOD_DIRECTORY); result = gnome_vfs_open_uri_cancellable( (GnomeVFSHandle **)method_handle, uri, mode, context);