From fd1a670fe7a1d09e3e0e13c816d56723f0f5c234 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Tue, 25 Jun 2002 13:24:53 +0000 Subject: [PATCH] r1601: Turned on more compiler warnings, and fixed some minor issues it threw up. --- ROX-Filer/Help/Changes | 6 +++++- ROX-Filer/src/action.c | 6 +++--- ROX-Filer/src/collection.c | 33 --------------------------------- ROX-Filer/src/configure.in | 4 ++-- ROX-Filer/src/dir.c | 2 +- ROX-Filer/src/display.h | 2 +- ROX-Filer/src/dnd.c | 16 ++++++++-------- ROX-Filer/src/dnd.h | 9 ++++----- ROX-Filer/src/gui_support.h | 2 +- ROX-Filer/src/menu.c | 14 ++++---------- ROX-Filer/src/mount.h | 2 +- ROX-Filer/src/panel.c | 4 ++-- ROX-Filer/src/pinboard.c | 14 ++------------ ROX-Filer/src/po/da.po | 2 +- ROX-Filer/src/po/de.po | 2 +- ROX-Filer/src/po/fr.po | 2 +- ROX-Filer/src/po/hu.po | 2 +- ROX-Filer/src/po/it.po | 2 +- ROX-Filer/src/po/nl.po | 2 +- ROX-Filer/src/po/pl.po | 2 +- ROX-Filer/src/po/ru.po | 2 +- ROX-Filer/src/po/sp.po | 2 +- ROX-Filer/src/po/zh_CN.po | 2 +- ROX-Filer/src/po/zh_TW.po | 2 +- ROX-Filer/src/remote.c | 4 ++-- ROX-Filer/src/sc.c | 17 +++++++++-------- ROX-Filer/src/sc.h | 4 ++-- ROX-Filer/src/session.c | 9 +++++---- ROX-Filer/src/support.h | 4 ++-- ROX-Filer/src/toolbar.c | 2 +- ROX-Filer/src/type.c | 2 +- ROX-Filer/src/usericons.c | 2 +- ROX-Filer/src/usericons.h | 2 +- 33 files changed, 69 insertions(+), 113 deletions(-) diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes index 81ddb6d0..0f4a9435 100644 --- a/ROX-Filer/Help/Changes +++ b/ROX-Filer/Help/Changes @@ -2,7 +2,11 @@ A RISC OS-like filer for X by Thomas Leonard -22-Jun-2002 +25-Jun-2002 +~~~~~~~~~~~ +Turned on more compiler warnings, and fixed some minor issues it threw up. + +22-Jun-2002 (Release 1.3.2) ~~~~~~~~~~~ Updated French translation (Vincent Lefèvre). diff --git a/ROX-Filer/src/action.c b/ROX-Filer/src/action.c index 39ebde15..95c960c5 100644 --- a/ROX-Filer/src/action.c +++ b/ROX-Filer/src/action.c @@ -121,8 +121,8 @@ static guchar *last_find_string = NULL; static guchar *new_entry_string = NULL; /* Static prototypes */ -static gboolean send(); -static gboolean send_error(); +static gboolean send(void); +static gboolean send_error(void); static gboolean send_dir(const char *dir); static gboolean read_exact(int source, char *buffer, ssize_t len); static void do_mount(guchar *path, gboolean mount); @@ -942,7 +942,7 @@ static void do_find(const char *path, const char *unused) } /* Like mode_compile(), but ignores spaces and bracketed bits */ -struct mode_change *nice_mode_compile(const char *mode_string, +static struct mode_change *nice_mode_compile(const char *mode_string, unsigned int masked_ops) { GString *new; diff --git a/ROX-Filer/src/collection.c b/ROX-Filer/src/collection.c index 5db6e7c0..756a21f8 100644 --- a/ROX-Filer/src/collection.c +++ b/ROX-Filer/src/collection.c @@ -306,39 +306,6 @@ GtkWidget* collection_new(void) return GTK_WIDGET(gtk_widget_new(collection_get_type(), NULL)); } -/* Note: The draw_item call gives the maximum area that can be - * drawn to. For the column on the far right, this extends to the - * edge of the window. Normally, use collection->item_width instead - * of area->width to calculate the position. - * - * test_point does not use a larger value for the width, but the - * x point of the click may be larger than the width. - */ -void collection_set_functions(Collection *collection, - CollectionDrawFunc draw_item, - CollectionTestFunc test_point, - gpointer user_data) -{ - GtkWidget *widget; - - g_return_if_fail(collection != NULL); - g_return_if_fail(IS_COLLECTION(collection)); - - widget = GTK_WIDGET(collection); - - if (!draw_item) - draw_item = default_draw_item; - if (!test_point) - test_point = default_test_point; - - collection->draw_item = draw_item; - collection->test_point = test_point; - collection->cb_user_data = user_data; - - if (GTK_WIDGET_REALIZED(widget)) - gtk_widget_queue_draw(widget); -} - /* After this we are unusable, but our data (if any) is still hanging around. * It will be freed later with finalize. */ diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in index 64e569ee..3850c3f9 100644 --- a/ROX-Filer/src/configure.in +++ b/ROX-Filer/src/configure.in @@ -56,12 +56,12 @@ ROX_REQUIRE(libxml-2.0, 2.0.0) dnl Checks for programs. AC_PROG_CC -dnl Use -Wall if possible +dnl Use -Wall, etc if possible [ if test "x$GCC" = "xyes"; then case " $CFLAGS " in *[\ \ ]-Wall[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wall" ;; + *) CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-declarations" ;; esac fi ] diff --git a/ROX-Filer/src/dir.c b/ROX-Filer/src/dir.c index d6fe34df..fe25e79c 100644 --- a/ROX-Filer/src/dir.c +++ b/ROX-Filer/src/dir.c @@ -249,7 +249,7 @@ static void free_recheck_list(Directory *dir) } /* If scanning state has changed then notify all filer windows */ -void dir_set_scanning(Directory *dir, gboolean scanning) +static void dir_set_scanning(Directory *dir, gboolean scanning) { GList *next; diff --git a/ROX-Filer/src/display.h b/ROX-Filer/src/display.h index 059361e5..46e8092a 100644 --- a/ROX-Filer/src/display.h +++ b/ROX-Filer/src/display.h @@ -35,7 +35,7 @@ extern Option o_display_show_thumbs; extern Option o_small_width; /* Prototypes */ -void display_init(); +void display_init(void); void display_set_layout(FilerWindow *filer_window, DisplayStyle style, DetailsType details); diff --git a/ROX-Filer/src/dnd.c b/ROX-Filer/src/dnd.c index 1592467b..38ed0440 100644 --- a/ROX-Filer/src/dnd.c +++ b/ROX-Filer/src/dnd.c @@ -71,7 +71,7 @@ static gchar *prompt_dest_path = NULL; gint motion_buttons_pressed = 0; /* Static prototypes */ -static void set_xds_prop(GdkDragContext *context, char *text); +static void set_xds_prop(GdkDragContext *context, const char *text); static gboolean drag_motion(GtkWidget *widget, GdkDragContext *context, gint x, @@ -150,8 +150,8 @@ static GtkObject *scrolled_adj = NULL; /* The object watched */ /* Possible values for drop_dest_type (can also be NULL). * In either case, drop_dest_path is the app/file/dir to use. */ -char *drop_dest_prog = "drop_dest_prog"; /* Run a program */ -char *drop_dest_dir = "drop_dest_dir"; /* Save to path */ +const char *drop_dest_prog = "drop_dest_prog"; /* Run a program */ +const char *drop_dest_dir = "drop_dest_dir"; /* Save to path */ GdkAtom XdndDirectSave0; GdkAtom xa_text_plain; @@ -164,7 +164,7 @@ Option o_dnd_spring_open; static Option o_dnd_spring_delay; static Option o_dnd_middle_menu; -void dnd_init() +void dnd_init(void) { XdndDirectSave0 = gdk_atom_intern("XdndDirectSave0", FALSE); xa_text_plain = gdk_atom_intern("text/plain", FALSE); @@ -182,7 +182,7 @@ void dnd_init() /* SUPPORT FUNCTIONS */ /* Set the XdndDirectSave0 property on the source window for this context */ -static void set_xds_prop(GdkDragContext *context, char *text) +static void set_xds_prop(GdkDragContext *context, const char *text) { gdk_property_change(context->source_window, XdndDirectSave0, @@ -504,7 +504,7 @@ static gboolean drag_motion(GtkWidget *widget, int item_number; GdkDragAction action = context->suggested_action; char *new_path = NULL; - char *type = NULL; + const char *type = NULL; gboolean retval = FALSE; if (o_dnd_drag_to_icons.int_value) @@ -581,7 +581,7 @@ static gboolean drag_motion(GtkWidget *widget, new_path = filer_window->sym_path; } - g_dataset_set_data(context, "drop_dest_type", type); + g_dataset_set_data(context, "drop_dest_type", (gpointer) type); if (type) { gdk_drag_status(context, action, time); @@ -600,7 +600,7 @@ static gboolean drag_motion(GtkWidget *widget, * Returns NULL to reject the drop, or drop_dest_prog/drop_dest_dir to * accept. Build the path based on item. */ -guchar *dnd_motion_item(GdkDragContext *context, DirItem **item_p) +const guchar *dnd_motion_item(GdkDragContext *context, DirItem **item_p) { DirItem *item = *item_p; diff --git a/ROX-Filer/src/dnd.h b/ROX-Filer/src/dnd.h index 7fab5067..e41136be 100644 --- a/ROX-Filer/src/dnd.h +++ b/ROX-Filer/src/dnd.h @@ -30,8 +30,8 @@ extern gint motion_buttons_pressed; extern gboolean o_no_hostnames; extern Option o_dnd_spring_open; -extern char *drop_dest_prog; -extern char *drop_dest_dir; +extern const char *drop_dest_prog; +extern const char *drop_dest_dir; extern GdkAtom XdndDirectSave0; extern GdkAtom text_uri_list; extern GdkAtom _rox_run_action; @@ -53,14 +53,13 @@ void drag_data_get(GtkWidget *widget, void make_drop_target(GtkWidget *widget, GtkDestDefaults defaults); void drag_set_dest(FilerWindow *filer_window); void drag_set_pinboard_dest(GtkWidget *widget); -void dnd_init(); -GtkWidget *create_dnd_options(); +void dnd_init(void); gboolean provides(GdkDragContext *context, GdkAtom target); void dnd_spring_load(GdkDragContext *context, FilerWindow *src_win); void dnd_spring_abort(void); GList *uri_list_to_glist(const char *uri_list); -guchar *dnd_motion_item(GdkDragContext *context, DirItem **item_p); +const guchar *dnd_motion_item(GdkDragContext *context, DirItem **item_p); gboolean dnd_motion_press(GtkWidget *widget, GdkEventButton *event); void dnd_motion_start(MotionType motion); diff --git a/ROX-Filer/src/gui_support.h b/ROX-Filer/src/gui_support.h index 91a1982e..79f8ec29 100644 --- a/ROX-Filer/src/gui_support.h +++ b/ROX-Filer/src/gui_support.h @@ -25,7 +25,7 @@ extern gint screen_width, screen_height; typedef void (*HelpFunc)(gpointer data); typedef const char *ParseFunc(gchar *line); -void gui_support_init(); +void gui_support_init(void); int get_choice(const char *title, const char *message, int number_of_buttons, ...); diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c index 8e52bba1..50a4f6d1 100644 --- a/ROX-Filer/src/menu.c +++ b/ROX-Filer/src/menu.c @@ -158,7 +158,6 @@ static void mini_buffer(gpointer data, guint action, GtkWidget *widget); static void resize(gpointer data, guint action, GtkWidget *widget); #define MENUS_NAME "menus2" -static void keys_changed(gpointer data); static GtkWidget *filer_menu; /* The popup filer menu */ static GtkWidget *filer_file_item; /* The File '' label */ @@ -310,8 +309,8 @@ void ensure_filer_menu(void) g_signal_connect(filer_file_menu, "unmap_event", G_CALLBACK(menu_closed), NULL); - g_signal_connect_object(G_OBJECT(filer_keys), "accel_changed", - (GCallback) keys_changed, NULL, 0); + g_signal_connect(filer_keys, "accel_changed", + G_CALLBACK(save_menus), NULL); } void menu_init(void) @@ -356,7 +355,7 @@ GtkItemFactory *menu_create(GtkItemFactoryEntry *def, int n_entries, } /* Prevent the user from setting a short-cut on this item */ -void menuitem_no_shortcuts(GtkWidget *item) +static void menuitem_no_shortcuts(GtkWidget *item) { /* XXX */ #if 0 @@ -806,7 +805,7 @@ static void menu_closed(GtkWidget *widget) } } -void target_callback(FilerWindow *filer_window, +static void target_callback(FilerWindow *filer_window, gint item, gpointer action) { @@ -1709,11 +1708,6 @@ static void save_menus(void) } } -static void keys_changed(gpointer data) -{ - save_menus(); -} - static void select_nth_item(GtkMenuShell *shell, int n) { GList *items; diff --git a/ROX-Filer/src/mount.h b/ROX-Filer/src/mount.h index 084b00dd..7c69e8ce 100644 --- a/ROX-Filer/src/mount.h +++ b/ROX-Filer/src/mount.h @@ -24,7 +24,7 @@ struct _MountPoint }; /* Prototypes */ -void mount_init(); +void mount_init(void); void mount_update(gboolean force); gboolean mount_is_mounted(const guchar *path, struct stat *info, struct stat *parent); diff --git a/ROX-Filer/src/panel.c b/ROX-Filer/src/panel.c index 25f7e61a..82a018cd 100644 --- a/ROX-Filer/src/panel.c +++ b/ROX-Filer/src/panel.c @@ -912,7 +912,7 @@ static gboolean drag_motion(GtkWidget *widget, PanelIcon *pi) { GdkDragAction action = context->suggested_action; - char *type = NULL; + const char *type = NULL; Icon *icon = (Icon *) pi; DirItem *item = icon->item; @@ -937,7 +937,7 @@ out: type = NULL; } - g_dataset_set_data(context, "drop_dest_type", type); + g_dataset_set_data(context, "drop_dest_type", (gpointer) type); if (type) { gdk_drag_status(context, action, time); diff --git a/ROX-Filer/src/pinboard.c b/ROX-Filer/src/pinboard.c index fb240946..d679a797 100644 --- a/ROX-Filer/src/pinboard.c +++ b/ROX-Filer/src/pinboard.c @@ -457,16 +457,6 @@ void pinboard_pin(const gchar *path, const gchar *name, int x, int y) pinboard_save(); } -/* Remove an icon from the pinboard */ -/* XXX: use destroy */ -void pinboard_unpin(PinIcon *pi) -{ - g_return_if_fail(pi != NULL); - - gtk_widget_destroy(pi->win); - pinboard_save(); -} - /* Put a border around the icon, briefly. * If icon is NULL then cancel any existing wink. * The icon will automatically unhighlight unless timeout is FALSE, @@ -1265,7 +1255,7 @@ static gboolean drag_motion(GtkWidget *widget, PinIcon *pi) { GdkDragAction action = context->suggested_action; - char *type = NULL; + const char *type = NULL; Icon *icon = (Icon *) pi; DirItem *item = icon->item; @@ -1293,7 +1283,7 @@ out: type = NULL; } - g_dataset_set_data(context, "drop_dest_type", type); + g_dataset_set_data(context, "drop_dest_type", (gpointer) type); if (type) { gdk_drag_status(context, action, time); diff --git a/ROX-Filer/src/po/da.po b/ROX-Filer/src/po/da.po index 1d163c0f..f10d4c45 100644 --- a/ROX-Filer/src/po/da.po +++ b/ROX-Filer/src/po/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Christian Storgaard \n" "Language-Team: LANGUAGE \n" diff --git a/ROX-Filer/src/po/de.po b/ROX-Filer/src/po/de.po index 11dcc48b..65bce7ff 100644 --- a/ROX-Filer/src/po/de.po +++ b/ROX-Filer/src/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: André Wyrwa \n" "Language-Team: ROX Mailing List \n" diff --git a/ROX-Filer/src/po/fr.po b/ROX-Filer/src/po/fr.po index 1abcacca..d087f86e 100644 --- a/ROX-Filer/src/po/fr.po +++ b/ROX-Filer/src/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.3.2\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-06-22 00:57+0200\n" "Last-Translator: Vincent Lefevre \n" "Language-Team: ROX Mailing List \n" diff --git a/ROX-Filer/src/po/hu.po b/ROX-Filer/src/po/hu.po index 6a72242b..2cae021b 100644 --- a/ROX-Filer/src/po/hu.po +++ b/ROX-Filer/src/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.3.1\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-05-27 14:24+0200\n" "Last-Translator: Andras Mohari \n" "Language-Team: Hungarian \n" diff --git a/ROX-Filer/src/po/it.po b/ROX-Filer/src/po/it.po index 071123e4..6e0a5fdf 100644 --- a/ROX-Filer/src/po/it.po +++ b/ROX-Filer/src/po/it.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.2.00\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-02-03 21:30-0500\n" "Last-Translator: Denis Manente \n" "Language-Team: ROX Mailing list \n" diff --git a/ROX-Filer/src/po/nl.po b/ROX-Filer/src/po/nl.po index 88301df8..7e50495a 100644 --- a/ROX-Filer/src/po/nl.po +++ b/ROX-Filer/src/po/nl.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.3.0\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: \n" "Last-Translator: Wilbert Berendsen \n" "Language-Team: ROX Mailing List \n" diff --git a/ROX-Filer/src/po/pl.po b/ROX-Filer/src/po/pl.po index 688b3572..a49b40f3 100644 --- a/ROX-Filer/src/po/pl.po +++ b/ROX-Filer/src/po/pl.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.2.0\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-04-20 21:00+0100\n" "Last-Translator: Krzysztof Krzy¿aniak \n" "Language-Team: Polish \n" diff --git a/ROX-Filer/src/po/ru.po b/ROX-Filer/src/po/ru.po index 4632f5e4..4effed3a 100644 --- a/ROX-Filer/src/po/ru.po +++ b/ROX-Filer/src/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.1.0\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2001-06-05 20:46+0300\n" "Last-Translator: Dmitry Elfimov \n" "Language-Team: Russian \n" diff --git a/ROX-Filer/src/po/sp.po b/ROX-Filer/src/po/sp.po index 84d6987a..96590224 100644 --- a/ROX-Filer/src/po/sp.po +++ b/ROX-Filer/src/po/sp.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.3.1\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2001-11-05\n" "Last-Translator: Marcelo Ramos \n" "Language-Team: ROX Mailing list \n" diff --git a/ROX-Filer/src/po/zh_CN.po b/ROX-Filer/src/po/zh_CN.po index 8e4aad4b..65f00975 100644 --- a/ROX-Filer/src/po/zh_CN.po +++ b/ROX-Filer/src/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.2.0\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-03-26 21:00+0100\n" "Last-Translator: Babyfai Cheung\n" "Language-Team: none\n" diff --git a/ROX-Filer/src/po/zh_TW.po b/ROX-Filer/src/po/zh_TW.po index 450cbae8..04d068d3 100644 --- a/ROX-Filer/src/po/zh_TW.po +++ b/ROX-Filer/src/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ROX-Filer 1.2.0\n" -"POT-Creation-Date: 2002-06-22 13:45+0100\n" +"POT-Creation-Date: 2002-06-22 13:58+0100\n" "PO-Revision-Date: 2002-03-26 21:00+0100\n" "Last-Translator: Babyfai Cheung\n" "Language-Team: none\n" diff --git a/ROX-Filer/src/remote.c b/ROX-Filer/src/remote.c index 973cf9ee..a4828d9b 100644 --- a/ROX-Filer/src/remote.c +++ b/ROX-Filer/src/remote.c @@ -68,7 +68,7 @@ struct _SOAP_call { static GHashTable *rpc_calls = NULL; /* MethodName -> Function */ /* Static prototypes */ -static GdkWindow *get_existing_ipc_window(); +static GdkWindow *get_existing_ipc_window(void); static gboolean get_ipc_property(GdkWindow *window, Window *r_xid); static void soap_send(GtkWidget *from, GdkAtom prop, GdkWindow *dest); static gboolean client_event(GtkWidget *window, @@ -921,7 +921,7 @@ static void soap_done(GtkWidget *widget, GdkEventProperty *event, gpointer data) gtk_main_quit(); } -gboolean too_slow(gpointer data) +static gboolean too_slow(gpointer data) { g_warning("Existing ROX-Filer process is not responding! Try with -n"); gtk_main_quit(); diff --git a/ROX-Filer/src/sc.c b/ROX-Filer/src/sc.c index 8c816eeb..c9d4be0b 100644 --- a/ROX-Filer/src/sc.c +++ b/ROX-Filer/src/sc.c @@ -97,7 +97,7 @@ static SmProperty *new_property(SmClient *client, return prop; } -gint close_connection(gpointer data) +static gint close_connection(gpointer data) { SmClient *client = (SmClient *)data; @@ -109,7 +109,8 @@ gint close_connection(gpointer data) /* Called when there's data to be read on the ICE file descriptor. Unpacks the message and triggers the correct callback... I think */ -void poll_ice_messages(gpointer data, gint source, GdkInputCondition condition) +static void poll_ice_messages(gpointer data, gint source, + GdkInputCondition condition) { SmClient *client = (SmClient *)data; Bool ret; @@ -122,7 +123,7 @@ void poll_ice_messages(gpointer data, gint source, GdkInputCondition condition) /* Called whenever an ICE connection is opened or closed */ -void ice_watch_fn(IceConn conn, IcePointer client_data, +static void ice_watch_fn(IceConn conn, IcePointer client_data, Bool opening, IcePointer *watch_data) { SmClient *client = (SmClient *)client_data; @@ -151,7 +152,7 @@ void ice_watch_fn(IceConn conn, IcePointer client_data, /* Callbacks for different SM messages */ -void sc_save_yourself(SmcConn conn, SmPointer client_data, int save_type, +static void sc_save_yourself(SmcConn conn, SmPointer client_data, int save_type, Bool shutdown, int interact_style, Bool fast) { SmClient *client = (SmClient *)client_data; @@ -166,7 +167,7 @@ void sc_save_yourself(SmcConn conn, SmPointer client_data, int save_type, SmcSaveYourselfDone(client->conn, success); } -void sc_shutdown_cancelled(SmcConn conn, SmPointer client_data) +static void sc_shutdown_cancelled(SmcConn conn, SmPointer client_data) { SmClient *client = (SmClient *)client_data; #ifdef DEBUG @@ -176,7 +177,7 @@ void sc_shutdown_cancelled(SmcConn conn, SmPointer client_data) client->shutdown_cancelled_fn(client); } -void sc_save_complete(SmcConn conn, SmPointer client_data) +static void sc_save_complete(SmcConn conn, SmPointer client_data) { SmClient *client = (SmClient *)client_data; #ifdef DEBUG @@ -186,7 +187,7 @@ void sc_save_complete(SmcConn conn, SmPointer client_data) client->save_complete_fn(client); } -void sc_die(SmcConn conn, SmPointer client_data) +static void sc_die(SmcConn conn, SmPointer client_data) { SmClient *client = (SmClient *)client_data; #ifdef DEBUG @@ -203,7 +204,7 @@ gboolean sc_session_up() return TRUE; } -SmClient *sc_new(gchar *client_id) +SmClient *sc_new(const gchar *client_id) { SmClient *client; diff --git a/ROX-Filer/src/sc.h b/ROX-Filer/src/sc.h index 91cc4d42..8a967415 100644 --- a/ROX-Filer/src/sc.h +++ b/ROX-Filer/src/sc.h @@ -33,8 +33,8 @@ struct _SmClient { gint input_tag; }; -gboolean sc_session_up(); -SmClient *sc_new(gchar *client_id); +gboolean sc_session_up(void); +SmClient *sc_new(const gchar *client_id); gboolean sc_connect(SmClient *client); void sc_get_prop_value(SmClient *client, const gchar *name, SmPropValue **val_ret, gint *nvals_ret); diff --git a/ROX-Filer/src/session.c b/ROX-Filer/src/session.c index 81a487d8..990ac922 100644 --- a/ROX-Filer/src/session.c +++ b/ROX-Filer/src/session.c @@ -34,8 +34,9 @@ #include "pinboard.h" #include "panel.h" #include "sc.h" +#include "session.h" -void save_state(SmClient *client) +static void save_state(SmClient *client) { FilerWindow *filer_window; Panel *panel; @@ -84,18 +85,18 @@ void save_state(SmClient *client) /* Callbacks for various SM messages */ -gboolean save_yourself(SmClient *client) +static gboolean save_yourself(SmClient *client) { save_state(client); return TRUE; } -void die(SmClient *client) +static void die(SmClient *client) { gtk_main_quit(); } -void session_init(gchar *client_id) +void session_init(const gchar *client_id) { SmClient *client; struct passwd *pw; diff --git a/ROX-Filer/src/support.h b/ROX-Filer/src/support.h index 668b31f7..0857a422 100644 --- a/ROX-Filer/src/support.h +++ b/ROX-Filer/src/support.h @@ -18,8 +18,8 @@ int save_xml_file(xmlDocPtr doc, const gchar *filename); xmlDocPtr soap_new(xmlNodePtr *ret_body); char *pathdup(const char *path); GString *make_path(const char *dir, const char *leaf); -const char *our_host_name(); -const char *our_host_name_for_dnd(); +const char *our_host_name(void); +const char *our_host_name_for_dnd(void); void debug_free_string(void *data); const char *user_name(uid_t uid); const char *group_name(gid_t gid); diff --git a/ROX-Filer/src/toolbar.c b/ROX-Filer/src/toolbar.c index 7fe4d4b2..cccc10d5 100644 --- a/ROX-Filer/src/toolbar.c +++ b/ROX-Filer/src/toolbar.c @@ -534,7 +534,7 @@ static gboolean drag_motion(GtkWidget *widget, g_dataset_set_data_full(context, "drop_dest_path", g_dirname(filer_window->sym_path), g_free); - g_dataset_set_data(context, "drop_dest_type", drop_dest_dir); + g_dataset_set_data(context, "drop_dest_type", (gpointer) drop_dest_dir); gdk_drag_status(context, action, time); dnd_spring_load(context, filer_window); diff --git a/ROX-Filer/src/type.c b/ROX-Filer/src/type.c index 06ed5d55..b0486ea8 100644 --- a/ROX-Filer/src/type.c +++ b/ROX-Filer/src/type.c @@ -438,7 +438,7 @@ GdkAtom type_to_atom(MIME_type *type) return retval; } -void show_shell_help(gpointer data) +static void show_shell_help(gpointer data) { info_message(_("Enter a shell command which will load \"$1\" into " "a suitable program. Eg:\n\n" diff --git a/ROX-Filer/src/usericons.c b/ROX-Filer/src/usericons.c index d18fd951..1d3bc203 100644 --- a/ROX-Filer/src/usericons.c +++ b/ROX-Filer/src/usericons.c @@ -169,7 +169,7 @@ void check_globicon(const guchar *path, DirItem *item) item->image = g_fscache_lookup(pixmap_cache, gi); } -gboolean create_diricon(const guchar *filepath, const guchar *iconpath) +static gboolean create_diricon(const guchar *filepath, const guchar *iconpath) { if (!convert_to_png(iconpath, make_path(filepath, ".DirIcon")->str)) return FALSE; diff --git a/ROX-Filer/src/usericons.h b/ROX-Filer/src/usericons.h index ab015418..4f59b42a 100644 --- a/ROX-Filer/src/usericons.h +++ b/ROX-Filer/src/usericons.h @@ -8,7 +8,7 @@ #define _USERICONS_H_ /* Public interface */ -void read_globicons(); +void read_globicons(void); void check_globicon(const guchar *path, DirItem *item); void icon_set_handler_dialog(DirItem *item, const guchar *path); -- 2.11.4.GIT