Commit d6cfd1e4 authored by Vincent Geddes's avatar Vincent Geddes

Fix "missing prototype" errors reported by gcc due to increased warning

	* plugins/gnome/glade-gnome.h,
	  plugins/gtk+/glade-gtk.c
	  plugins/gtk+/glade-gtk.h
	  plugins/gtk+/Makefile.am,
	  plugins/gnome/glade-gnome.c,
	  plugins/gnome/Makefile.am,
	  src/glade-project-window.c,
	  gladeui/glade-editor-property.c,
	  gladeui/glade-parameter.c,
	  gladeui/glade-widget.c,
	  gladeui/glade-command.c,
	  gladeui/glade-palette.c,
	  gladeui/glade-utils.c,
	  gladeui/glade-accumulators.c,
	  gladeui/glade-palette.h,
	  gladeui/glade-binding.h,
	  gladeui/glade-app.c,
	  gladeui/glade-property.c,
	  gladeui/glade-builtins.c,
	  gladeui/glade-project.c,
	  gladeui/Makefile.am: Fix "missing prototype" errors reported by
	  gcc due to increased warning level (-Wmissing-prototypes). Added
	  glade-gnome.h with function prototypes as well.

svn path=/trunk/; revision=1384
parent eb9ddfa8
2007-06-22 Vincent Geddes <vgeddes@gnome.org>
* plugins/gnome/glade-gnome.h,
plugins/gtk+/glade-gtk.c
plugins/gtk+/glade-gtk.h
plugins/gtk+/Makefile.am,
plugins/gnome/glade-gnome.c,
plugins/gnome/Makefile.am,
src/glade-project-window.c,
gladeui/glade-editor-property.c,
gladeui/glade-parameter.c,
gladeui/glade-widget.c,
gladeui/glade-command.c,
gladeui/glade-palette.c,
gladeui/glade-utils.c,
gladeui/glade-accumulators.c,
gladeui/glade-palette.h,
gladeui/glade-binding.h,
gladeui/glade-app.c,
gladeui/glade-property.c,
gladeui/glade-builtins.c,
gladeui/glade-project.c,
gladeui/Makefile.am: Fix "missing prototype" errors reported by
gcc due to increased warning level (-Wmissing-prototypes). Added
glade-gnome.h with function prototypes as well.
2007-06-21 Christian Persch <chpe@gnome.org>
* bindings/python/Makefile.am:
......@@ -12,9 +38,6 @@
* gladeui/glade-app.[ch], gladeui/glade-widget-adaptor.c: Misc cleanups.
* plugins/gtk+/glade-gtk.c, plugins/gtk+/glade-gtk.h: Fix errors reported
by gcc (due to higher warning level).
2006-06-20 Tristan Van Berkom <tvb@gnome.org>
* plugins/gtk+/glade-gtk.c: Remember notebook page when
......
......@@ -152,7 +152,7 @@ glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL)
&& mv glade-marshallers-h.tmp glade-marshallers.h \
|| ( rm -f glade-marshallers-h.tmp && exit 1)
glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \
$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body --header > glade-marshallers-c.tmp \
&& mv glade-marshallers-c.tmp glade-marshallers.c \
|| ( rm -f glade-marshallers-c.tmp && exit 1 )
......
......@@ -25,6 +25,8 @@
#include "config.h"
#include "glade-accumulators.h"
#include <glib-object.h>
......
......@@ -276,7 +276,7 @@ glade_app_refresh_undo_redo_button (GladeApp *app,
gtk_widget_set_sensitive (button, command != NULL);
}
void
static void
glade_app_update_ui_default (GladeApp *app)
{
GList *list;
......
......@@ -79,18 +79,18 @@ struct _GladeBinding {
GladeBindingCtrl ctrl;
};
void glade_binding_load_all (void);
void glade_binding_load_all (void);
void glade_binding_unload_all (void);
void glade_binding_unload_all (void);
GladeBinding *glade_binding_get (const gchar *name);
GladeBinding *glade_binding_get (const gchar *name);
const gchar *glade_binding_get_name (GladeBinding *binding);
const gchar *glade_binding_get_name (GladeBinding *binding);
GList *glade_binding_get_all ();
GList *glade_binding_get_all (void);
void glade_binding_library_load (GladeBinding *binding,
const gchar *library);
void glade_binding_library_load (GladeBinding *binding,
const gchar *library);
G_END_DECLS
......
......@@ -84,7 +84,7 @@ glade_standard_stock_append_prefix (const gchar *prefix)
stock_prefixs = g_slist_append (stock_prefixs, g_strdup (prefix));
}
GArray *
static GArray *
list_stock_items (gboolean include_images)
{
GtkStockItem item;
......
......@@ -868,7 +868,7 @@ glade_command_placeholder_connect (CommandData *cdata,
* while newly added widgets will prefer packing defaults.
*
*/
void
static void
glade_command_add (GList *widgets,
GladeWidget *parent,
GladePlaceholder *placeholder,
......@@ -992,7 +992,7 @@ glade_command_add (GList *widgets,
*
* Performs a remove command on all widgets in @widgets from @parent.
*/
void
static void
glade_command_remove (GList *widgets)
{
GladeCommandAddRemove *me;
......@@ -1358,7 +1358,7 @@ GLADE_MAKE_COMMAND (GladeCommandClipboardAddRemove, glade_command_clipboard_add_
#define GLADE_IS_COMMAND_CLIPBOARD_ADD_REMOVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GLADE_COMMAND_CLIPBOARD_ADD_REMOVE_TYPE))
#define GLADE_IS_COMMAND_CLIPBOARD_ADD_REMOVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GLADE_COMMAND_CLIPBOARD_ADD_REMOVE_TYPE))
void
static void
glade_command_clipboard_add_remove_common (GList *widgets, gboolean add)
{
GladeCommandClipboardAddRemove *me;
......@@ -1409,7 +1409,7 @@ glade_command_clipboard_add_remove_common (GList *widgets, gboolean add)
*
* Performs an add command on all widgets in @widgets to the clipboard.
*/
void
static void
glade_command_clipboard_add(GList *widgets)
{
glade_command_clipboard_add_remove_common(widgets, TRUE);
......@@ -1421,11 +1421,16 @@ glade_command_clipboard_add(GList *widgets)
*
* Performs a remove command on all widgets in @widgets from the clipboard.
*/
void
/* not used anywhere */
#if 0
static void
glade_command_clipboard_remove (GList *widgets)
{
glade_command_clipboard_add_remove_common(widgets, FALSE);
}
#endif
static gboolean
glade_command_clipboard_add_execute (GladeCommandClipboardAddRemove *me)
......
......@@ -2230,7 +2230,7 @@ glade_eprop_object_populate_view (GladeEditorProperty *eprop,
g_list_free (toplevels);
}
gboolean
static gboolean
glade_eprop_object_clear_iter (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
......@@ -2241,7 +2241,7 @@ glade_eprop_object_clear_iter (GtkTreeModel *model,
return FALSE;
}
gboolean
static gboolean
glade_eprop_object_selected_widget (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
......@@ -2596,7 +2596,7 @@ glade_eprop_objects_load (GladeEditorProperty *eprop, GladeProperty *property)
}
gboolean
static gboolean
glade_eprop_objects_selected_widget (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
......@@ -3042,7 +3042,7 @@ GLADE_MAKE_EPROP (GladeEPropAccel, glade_eprop_accel)
#define GLADE_EPROP_ACCEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GLADE_EPROP_ACCEL, GladeEPropAccelClass))
GtkTreeModel *
static GtkTreeModel *
create_keysyms_model (void)
{
GtkTreeModel *model;
......@@ -3496,7 +3496,7 @@ glade_eprop_accel_view (GladeEditorProperty *eprop)
return view_widget;
}
gboolean
static gboolean
glade_eprop_accel_accum_accelerators (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
......
......@@ -94,10 +94,10 @@ static void glade_palette_append_item_group (GladePalette *palette, GladeWidgetG
static void glade_palette_update_appearance (GladePalette *palette);
G_DEFINE_TYPE(GladePalette, glade_palette, GTK_TYPE_VBOX)
G_DEFINE_TYPE (GladePalette, glade_palette, GTK_TYPE_VBOX)
void
static void
selector_button_toggled_cb (GtkToggleButton *button, GladePalette *palette)
{
if (gtk_toggle_button_get_active (button))
......
......@@ -83,6 +83,8 @@ void glade_palette_set_use_small_item_icons (GladePalette *palette,
void glade_palette_set_show_selector_button (GladePalette *palette,
gboolean show_selector_button);
gboolean glade_palette_get_show_selector_button (GladePalette *palette);
G_END_DECLS
......
......@@ -221,7 +221,7 @@ glade_parameter_new_from_node (GladeXmlNode *node)
* Returns: the #GList node containing the located #GladeParameter,
* or %NULL if none is found
*/
GList *
static GList *
glade_parameter_list_find_by_key (GList *list, const gchar *key)
{
GladeParameter *parameter;
......
......@@ -942,7 +942,7 @@ glade_project_has_object (GladeProject *project, GObject *object)
*
* TODO: Write me
*/
void
static void
glade_project_release_widget_name (GladeProject *project, GladeWidget *glade_widget, const char *widget_name)
{
const char *first_number = widget_name;
......@@ -1160,7 +1160,7 @@ glade_project_new_widget_name (GladeProject *project, const char *base_name)
return name;
}
void
static void
glade_project_set_has_selection (GladeProject *project, gboolean has_selection)
{
g_assert (GLADE_IS_PROJECT (project));
......
......@@ -93,7 +93,7 @@ glade_property_dup_impl (GladeProperty *template_prop, GladeWidget *widget)
return property;
}
gboolean
static gboolean
glade_property_equals_value_impl (GladeProperty *property,
const GValue *value)
{
......@@ -1101,7 +1101,7 @@ glade_property_equals_value (GladeProperty *property,
*
* Returns: Whether this property is equal to the value provided
*/
gboolean
static gboolean
glade_property_equals_va_list (GladeProperty *property, va_list vl)
{
GValue *value;
......
......@@ -772,7 +772,7 @@ glade_util_can_draw_nodes (GtkWidget *sel_widget, GdkWindow *sel_win,
*
* Returns: %FALSE
*/
gboolean
static gboolean
glade_util_draw_nodes_idle (GdkWindow *expose_win)
{
GtkWidget *expose_widget;
......
......@@ -2128,7 +2128,7 @@ glade_widget_debug_real (GladeWidget *widget, int indent)
* Prints some information about a #GladeWidget, currently
* this is unmaintained.
*/
void
static void
glade_widget_debug (GladeWidget *widget)
{
glade_widget_debug_real (widget, 0);
......@@ -3246,7 +3246,7 @@ glade_widget_child_get_property (GladeWidget *widget,
}
gboolean
static gboolean
glade_widget_event_private (GtkWidget *widget,
GdkEvent *event,
GladeWidget *gwidget)
......
......@@ -22,8 +22,11 @@ libgladegnome_la_CFLAGS = \
libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
libgladegnome_la_LIBADD = $(libgladeui) $(GLADE_LIBS)
libgladegnomeincludedir= $(includedir)/libgladeui-1.0/gladeui
libgladegnomeinclude_HEADERS = glade-gnome.h
if PLATFORM_WIN32
libgladegnome_la_LDFLAGS += -no-undefined
libgladegnome_la_LDFLAGS += -no-undefined
endif
......
......@@ -22,6 +22,8 @@
#include <config.h>
#include "glade-gnome.h"
#include <gladeui/glade.h>
#include <gladeui/glade-editor-property.h>
......@@ -41,7 +43,7 @@ empty (GObject *container, GladeCreateReason reason)
/* Catalog init function */
void
glade_gnomeui_init ()
glade_gnomeui_init (void)
{
gchar *argv[2] = {"glade-3", NULL};
GtkStockItem items [] = {
......@@ -279,7 +281,7 @@ glade_gnome_app_set_property (GladeWidgetAdaptor *adaptor,
/* GnomeAppBar */
GType
gnome_app_bar_get_type ()
gnome_app_bar_get_type (void)
{
return gnome_appbar_get_type ();
}
......@@ -1176,14 +1178,6 @@ glade_gnome_file_entry_set_property (GladeWidgetAdaptor *adaptor,
id, value);
}
/* GnomePixmapEntry */
void
glade_gnome_pixmap_entry_set_do_preview (GObject *object, GValue *value)
{
gnome_pixmap_entry_set_preview (GNOME_PIXMAP_ENTRY (object),
g_value_get_boolean (value));
}
/* GnomeFontPicker */
static void
glade_gnome_font_picker_set_mode (GObject *object, const GValue *value)
......@@ -1390,19 +1384,6 @@ glade_gnome_pixmap_set_scaled_common (GObject *object,
}
}
void
glade_gnome_pixmap_set_scaled_width (GObject *object, GValue *value)
{
glade_gnome_pixmap_set_scaled_common (object, value, "scaled-height");
}
void
glade_gnome_pixmap_set_scaled_height (GObject *object, GValue *value)
{
glade_gnome_pixmap_set_scaled_common (object, value, "scaled-width");
}
void
glade_gnome_pixmap_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
......
#ifndef __GLADE_GNOME_H__
#define __GLADE_GNOME_H__
#include <gladeui/glade.h>
#include <gtk/gtk.h>
void
glade_gnomeui_init (void);
void
glade_gnome_icon_entry_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_app_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GObject *
glade_gnome_app_get_internal_child (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *name);
GList *
glade_gnome_app_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_app_set_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_app_get_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_app_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GType gnome_app_bar_get_type (void);
void
glade_gnome_app_bar_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
void
glade_gnome_date_edit_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
void
glade_gnome_druid_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
void
glade_gnome_druid_add_child (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child);
void
glade_gnome_druid_remove_child (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child);
void
glade_gnome_druid_set_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_druid_get_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_dps_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GObject *
glade_gnome_dps_get_internal_child (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *name);
GList *
glade_gnome_dps_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_dps_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GParamSpec *
glade_gnome_dpe_position_spec (void);
void
glade_gnome_dpe_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_canvas_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GObject *
glade_gnome_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *name);
GList *
glade_gnome_dialog_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_about_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
void
glade_gnome_about_dialog_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GParamSpec *
glade_gnome_message_box_type_spec (void);
void
glade_gnome_message_box_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GObject *
glade_gnome_entry_get_internal_child (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *name);
void
glade_gnome_entry_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GList *
glade_gnome_entry_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_entry_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_file_entry_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_font_picker_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GList *
glade_gnome_font_picker_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_font_picker_add_child (GladeWidgetAdaptor *adaptor,
GtkWidget *container,
GtkWidget *child);
void
glade_gnome_font_picker_remove_child (GladeWidgetAdaptor *adaptor,
GtkWidget *container,
GtkWidget *child);
void
glade_gnome_font_picker_replace_child (GladeWidgetAdaptor *adaptor,
GtkWidget *container,
GtkWidget *current,
GtkWidget *new_widget);
void
glade_gnome_icon_list_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GParamSpec *
glade_gnome_icon_list_selection_mode_spec (void);
void
glade_gnome_icon_list_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
void
glade_gnome_pixmap_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
GParamSpec *
glade_gnome_bonobo_dock_placement_spec (void);
GParamSpec *
glade_gnome_bonobo_dock_item_behavior_spec (void);
GParamSpec *
glade_gnome_gtk_pack_type_spec (void);
void
glade_gnome_bonobodock_add_child (GladeWidgetAdaptor *adaptor,
GObject *object,
GObject *child);
void
glade_gnome_bonobodock_remove_child (GladeWidgetAdaptor *adaptor,
GObject *object,
GObject *child);
GList *
glade_gnome_bonobodock_get_children (GladeWidgetAdaptor *adaptor,
GObject *object);
void
glade_gnome_bonobodock_replace_child (GladeWidgetAdaptor *adaptor,
GtkWidget *container,
GtkWidget *current,
GtkWidget *new_widget);
void
glade_gnome_bonobodock_set_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_bonobodock_get_child_property (GladeWidgetAdaptor *adaptor,
GObject *container,
GObject *child,
const gchar *property_name,
GValue *value);
void
glade_gnome_bonobodock_set_property (GladeWidgetAdaptor *adaptor,
GObject *object,
const gchar *id,
const GValue *value);
#endif /* __GLADE_GNOME_H__ */
......@@ -23,12 +23,15 @@ libgladegtk_la_CFLAGS = \
$(WARN_CFLAGS) \
$(AM_CFLAGS)
libgladegtk_la_SOURCES = glade-gtk.c glade-gtk.h
libgladegtk_la_SOURCES = glade-gtk.c
libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS)
libgladegtkincludedir= $(includedir)/libgladeui-1.0/gladeui
libgladegtkinclude_HEADERS = glade-gtk.h
if PLATFORM_WIN32
libgladegtk_la_LDFLAGS += -no-undefined
libgladegtk_la_LDFLAGS += -no-undefined
endif
......
......@@ -910,7 +910,7 @@ gpw_refresh_projects_list_menu (GladeProjectWindow *window)
}
void
static void
gpw_recent_add (GladeProjectWindow *gpw, const gchar *path)
{
GtkRecentData *recent_data;
......@@ -948,7 +948,7 @@ gpw_recent_add (GladeProjectWindow *gpw, const gchar *path)
}
void
static void
gpw_recent_remove (GladeProjectWindow *gpw, const gchar *path)
{
gchar *uri;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment