Commit 0b1d4e99 authored by Juan Pablo Ugarte's avatar Juan Pablo Ugarte

Fix tab/space identation

parent 583e024e
Pipeline #23038 passed with stages
in 9 minutes and 49 seconds
......@@ -31,8 +31,9 @@
gboolean
_glade_single_object_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return, gpointer dummy)
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
GObject *object = g_value_get_object (handler_return);
g_value_set_object (return_accu, object);
......@@ -42,9 +43,9 @@ _glade_single_object_accumulator (GSignalInvocationHint *ihint,
gboolean
_glade_integer_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
gboolean continue_emission;
gint retval;
......@@ -59,9 +60,9 @@ _glade_integer_handled_accumulator (GSignalInvocationHint *ihint,
/* From gtkmain.c */
gboolean
_glade_boolean_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
gboolean continue_emission;
gboolean signal_handled;
......@@ -75,8 +76,9 @@ _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint,
gboolean
_glade_string_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return, gpointer dummy)
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
const gchar *handler_str;
......@@ -103,8 +105,9 @@ _glade_strv_handled_accumulator (GSignalInvocationHint *ihint,
gboolean
_glade_stop_emission_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return, gpointer dummy)
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
g_value_copy (handler_return, return_accu);
......
......@@ -6,34 +6,34 @@
G_BEGIN_DECLS
gboolean _glade_single_object_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
gboolean _glade_integer_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
gboolean _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
gboolean _glade_string_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
gboolean _glade_strv_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
gboolean _glade_stop_emission_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
G_END_DECLS
#endif /* __GLADE_ACCUMULATORS_H__ */
......@@ -417,7 +417,7 @@ static void
glade_app_class_init (GladeAppClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
object_class->constructor = glade_app_constructor;
......@@ -858,13 +858,13 @@ glade_app_new (void)
void
glade_app_search_docs (const gchar *book,
const gchar *page,
const gchar *search)
const gchar *page,
const gchar *search)
{
GladeApp *app;
app = glade_app_get ();
g_signal_emit (G_OBJECT (app), glade_app_signals[DOC_SEARCH], 0,
book, page, search);
book, page, search);
}
......@@ -77,8 +77,8 @@ gint glade_app_config_save (void);
gboolean glade_app_do_event (GdkEvent *event);
gboolean glade_app_get_catalog_version (const gchar *name,
gint *major,
gint *minor);
gint *major,
gint *minor);
GList *glade_app_get_catalogs (void);
GladeCatalog *glade_app_get_catalog (const gchar *name);
GladeClipboard* glade_app_get_clipboard (void);
......@@ -96,8 +96,8 @@ void glade_app_set_accel_group (GtkAccelGroup *accel_group);
GtkAccelGroup *glade_app_get_accel_group (void);
void glade_app_search_docs (const gchar *book,
const gchar *page,
const gchar *search);
const gchar *page,
const gchar *search);
/* package paths */
const gchar *glade_app_get_catalogs_dir (void) G_GNUC_CONST;
......
......@@ -68,35 +68,35 @@ struct _GladeBaseEditorClass
GType glade_base_editor_get_type (void);
GladeBaseEditor *glade_base_editor_new (GObject *container,
GladeEditable *main_editable,
...);
GladeEditable *main_editable,
...);
void glade_base_editor_append_types (GladeBaseEditor *editor,
GType parent_type,
...);
GType parent_type,
...);
void glade_base_editor_add_editable (GladeBaseEditor *editor,
GladeWidget *gchild,
GladeEditorPageType page);
GladeWidget *gchild,
GladeEditorPageType page);
void glade_base_editor_add_default_properties (GladeBaseEditor *editor,
GladeWidget *gchild);
GladeWidget *gchild);
void glade_base_editor_add_properties (GladeBaseEditor *editor,
GladeWidget *gchild,
gboolean packing,
...);
GladeWidget *gchild,
gboolean packing,
...);
void glade_base_editor_add_label (GladeBaseEditor *editor,
gchar *str);
gchar *str);
void glade_base_editor_set_show_signal_editor (GladeBaseEditor *editor,
gboolean val);
gboolean val);
/* Convenience functions */
GtkWidget *glade_base_editor_pack_new_window (GladeBaseEditor *editor,
gchar *title,
gchar *help_markup);
gchar *title,
gchar *help_markup);
G_END_DECLS
......
......@@ -303,8 +303,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
{
gchar *clean_name = clean_stock_name (item.label);
if (!glade_get_displayable_value (etype, enum_values[i].value_nick))
glade_register_translated_value (etype, enum_values[i].value_nick, clean_name);
if (!glade_get_displayable_value (etype, enum_values[i].value_nick))
glade_register_translated_value (etype, enum_values[i].value_nick, clean_name);
g_free (clean_name);
}
}
......@@ -340,8 +340,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gchar *clean_name = clean_stock_name (item.label);
/* These are translated, we just cut out the mnemonic underscores */
if (!glade_get_displayable_value (etype, enum_values[i].value_nick))
glade_register_translated_value (etype, enum_values[i].value_nick, clean_name);
if (!glade_get_displayable_value (etype, enum_values[i].value_nick))
glade_register_translated_value (etype, enum_values[i].value_nick, clean_name);
g_free (clean_name);
}
}
......@@ -349,11 +349,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS
for (i = 0; i < G_N_ELEMENTS (builtin_stock_images); i++)
{
/* these ones are translated from glade */
if (!glade_get_displayable_value (etype, builtin_stock_images[i]))
glade_register_displayable_value (etype,
builtin_stock_images[i],
GETTEXT_PACKAGE,
builtin_stock_displayables[i]);
if (!glade_get_displayable_value (etype, builtin_stock_images[i]))
glade_register_displayable_value (etype,
builtin_stock_images[i],
GETTEXT_PACKAGE,
builtin_stock_displayables[i]);
}
}
return etype;
......@@ -427,7 +427,7 @@ param_objects_validate (GParamSpec * pspec, GValue * value)
object = list->data;
if (!(G_OBJECT_TYPE (object) == ospec->type ||
g_type_is_a (G_OBJECT_TYPE (object), ospec->type)))
g_type_is_a (G_OBJECT_TYPE (object), ospec->type)))
toremove = g_list_prepend (toremove, object);
}
......@@ -526,7 +526,7 @@ glade_standard_pixbuf_spec (void)
{
return g_param_spec_object ("pixbuf", _("Image File Name"),
_("Enter a filename, relative path or full path to "
"load the image"), GDK_TYPE_PIXBUF,
"load the image"), GDK_TYPE_PIXBUF,
G_PARAM_READWRITE);
}
......
......@@ -11,8 +11,8 @@ typedef struct _GladeParamSpecObjects GladeParamSpecObjects;
#define GLADE_TYPE_STOCK (glade_standard_stock_get_type())
#define GLADE_TYPE_STOCK_IMAGE (glade_standard_stock_image_get_type())
#define GLADE_TYPE_GLIST (glade_glist_get_type())
#define GLADE_TYPE_PARAM_OBJECTS (glade_param_objects_get_type())
#define GLADE_TYPE_GLIST (glade_glist_get_type())
#define GLADE_TYPE_PARAM_OBJECTS (glade_param_objects_get_type())
#define GLADE_IS_STOCK(pspec) \
(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GLADE_TYPE_STOCK))
......@@ -33,13 +33,13 @@ GType glade_glist_get_type (void) G_GNUC_CONST;
GType glade_param_objects_get_type (void) G_GNUC_CONST;
GParamSpec *glade_param_spec_objects (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType accepted_type,
GParamFlags flags);
const gchar *nick,
const gchar *blurb,
GType accepted_type,
GParamFlags flags);
void glade_param_spec_objects_set_type (GladeParamSpecObjects *pspec,
GType type);
GType type);
GType glade_param_spec_objects_get_type (GladeParamSpecObjects *pspec);
GParamSpec *glade_standard_pixbuf_spec (void);
......
......@@ -522,18 +522,18 @@ catalogs_from_path (GList *catalogs, const gchar *path)
if (!g_str_has_suffix (filename, ".xml"))
continue;
/* Special case, ignore gresource files (which are present
* while running tests)
*/
if (g_str_has_suffix (filename, ".gresource.xml"))
continue;
/* If we're running in the bundle, don't ever try to load
* anything except the GTK+ catalog
*/
if (g_getenv (GLADE_ENV_BUNDLED) != NULL &&
strcmp (filename, "gtk+.xml") != 0)
continue;
/* Special case, ignore gresource files (which are present
* while running tests)
*/
if (g_str_has_suffix (filename, ".gresource.xml"))
continue;
/* If we're running in the bundle, don't ever try to load
* anything except the GTK+ catalog
*/
if (g_getenv (GLADE_ENV_BUNDLED) != NULL &&
strcmp (filename, "gtk+.xml") != 0)
continue;
catalog_filename = g_build_filename (path, filename, NULL);
catalog = catalog_open (catalog_filename);
......@@ -574,7 +574,7 @@ glade_catalog_add_path (const gchar *path)
g_return_if_fail (path != NULL);
if (g_list_find_custom (catalog_paths, path, (GCompareFunc) g_strcmp0) == NULL)
catalog_paths = g_list_append (catalog_paths, g_strdup (path));
catalog_paths = g_list_append (catalog_paths, g_strdup (path));
}
/**
......@@ -590,14 +590,14 @@ glade_catalog_remove_path (const gchar *path)
GList *l;
if (path == NULL)
{
g_list_free_full (catalog_paths, g_free);
catalog_paths = NULL;
}
{
g_list_free_full (catalog_paths, g_free);
catalog_paths = NULL;
}
else if ((l = g_list_find_custom (catalog_paths, path, (GCompareFunc) g_strcmp0)))
{
catalog_paths = g_list_remove_link (catalog_paths, l);
}
{
catalog_paths = g_list_remove_link (catalog_paths, l);
}
}
/**
......@@ -685,17 +685,17 @@ glade_catalog_load_all (void)
/* Dont print missing icons in unit tests */
if (glade_widget_adaptor_get_missing_icon (adaptor) &&
g_getenv (GLADE_ENV_TESTING) == NULL)
g_getenv (GLADE_ENV_TESTING) == NULL)
{
if (!icon_warning)
icon_warning = g_string_new ("Glade needs artwork; "
"a default icon will be used for "
"the following classes:");
g_string_append_printf (icon_warning,
"\n\t%s\tneeds an icon named '%s'",
glade_widget_adaptor_get_name (adaptor),
glade_widget_adaptor_get_missing_icon (adaptor));
g_string_append_printf (icon_warning,
"\n\t%s\tneeds an icon named '%s'",
glade_widget_adaptor_get_name (adaptor),
glade_widget_adaptor_get_missing_icon (adaptor));
}
}
......
......@@ -28,11 +28,11 @@
G_BEGIN_DECLS
#define GLADE_TYPE_CELL_RENDERER_ICON (glade_cell_renderer_icon_get_type ())
#define GLADE_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIcon))
#define GLADE_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass))
#define GLADE_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_ICON))
#define GLADE_IS_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_ICON))
#define GLADE_TYPE_CELL_RENDERER_ICON (glade_cell_renderer_icon_get_type ())
#define GLADE_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIcon))
#define GLADE_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass))
#define GLADE_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CELL_RENDERER_ICON))
#define GLADE_IS_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_CELL_RENDERER_ICON))
#define GLADE_CELL_RENDERER_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_CELL_RENDERER_ICON, GladeCellRendererIconClass))
typedef struct _GladeCellRendererIcon GladeCellRendererIcon;
......@@ -51,7 +51,7 @@ struct _GladeCellRendererIconClass
GtkCellRendererPixbufClass parent_class;
void (* activate) (GladeCellRendererIcon *cell_renderer_icon,
const gchar *path);
const gchar *path);
};
GType glade_cell_renderer_icon_get_type (void) G_GNUC_CONST;
......@@ -59,11 +59,11 @@ GtkCellRenderer *glade_cell_renderer_icon_new (void);
gboolean glade_cell_renderer_icon_get_active (GladeCellRendererIcon *icon);
void glade_cell_renderer_icon_set_active (GladeCellRendererIcon *icon,
gboolean setting);
gboolean setting);
gboolean glade_cell_renderer_icon_get_activatable (GladeCellRendererIcon *icon);
void glade_cell_renderer_icon_set_activatable (GladeCellRendererIcon *icon,
gboolean setting);
gboolean setting);
G_END_DECLS
......
......@@ -35,7 +35,7 @@ GType glade_clipboard_get_type (void);
GladeClipboard *glade_clipboard_new (void);
void glade_clipboard_add (GladeClipboard *clipboard,
GList *widgets);
GList *widgets);
void glade_clipboard_clear (GladeClipboard *clipboard);
gboolean glade_clipboard_get_has_selection(GladeClipboard *clipboard);
......@@ -43,4 +43,4 @@ GList *glade_clipboard_widgets (GladeClipboard *clipboard);
G_END_DECLS
#endif /* __GLADE_CLIPBOARD_H__ */
#endif /* __GLADE_CLIPBOARD_H__ */
This diff is collapsed.
......@@ -66,7 +66,7 @@ struct _GladeCommandClass
GType glade_command_get_type (void);
void glade_command_push_group (const gchar *fmt,
...) G_GNUC_PRINTF (1, 2);
...) G_GNUC_PRINTF (1, 2);
void glade_command_pop_group (void);
gint glade_command_get_group_depth (void);
......@@ -75,21 +75,21 @@ gint glade_command_group_id (GladeCommand *com
gboolean glade_command_execute (GladeCommand *command);
gboolean glade_command_undo (GladeCommand *command);
gboolean glade_command_unifies (GladeCommand *command,
GladeCommand *other);
GladeCommand *other);
void glade_command_collapse (GladeCommand *command,
GladeCommand *other);
GladeCommand *other);
/************************ project ******************************/
void glade_command_set_project_target (GladeProject *project,
const gchar *catalog,
gint major,
gint minor);
const gchar *catalog,
gint major,
gint minor);
void glade_command_set_project_domain (GladeProject *project,
const gchar *domain);
const gchar *domain);
void glade_command_set_project_template(GladeProject *project,
GladeWidget *widget);
GladeWidget *widget);
void glade_command_set_project_license (GladeProject *project,
const gchar *license);
......@@ -100,21 +100,21 @@ void glade_command_set_project_resource_path (GladeProject *project,
/************************** properties *********************************/
void glade_command_set_property_enabled(GladeProperty *property,
gboolean enabled);
gboolean enabled);
void glade_command_set_property (GladeProperty *property,
...);
...);
void glade_command_set_property_value (GladeProperty *property,
const GValue *value);
const GValue *value);
void glade_command_set_properties (GladeProperty *property,
const GValue *old_value,
const GValue *new_value,
...);
const GValue *old_value,
const GValue *new_value,
...);
void glade_command_set_properties_list (GladeProject *project,
GList *props); /* list of GCSetPropData */
GList *props); /* list of GCSetPropData */
/************************** name ******************************/
......@@ -124,7 +124,7 @@ void glade_command_set_name (GladeWidget *glade_widget, con
/************************ protection ******************************/
void glade_command_lock_widget (GladeWidget *widget,
GladeWidget *lock);
GladeWidget *lock);
void glade_command_unlock_widget (GladeWidget *widget);
......@@ -132,49 +132,49 @@ void glade_command_unlock_widget (GladeWidget *widget);
/************************ create/add/delete ******************************/
void glade_command_add (GList *widgets,
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project,
gboolean pasting);
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project,
gboolean pasting);
void glade_command_delete (GList *widgets);
GladeWidget *glade_command_create (GladeWidgetAdaptor *adaptor,
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project);
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project);
/************************ cut/paste/dnd ******************************/
void glade_command_cut (GList *widgets);
void glade_command_paste (GList *widgets,
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project);
GladeWidget *parent,
GladePlaceholder *placeholder,
GladeProject *project);
void glade_command_dnd (GList *widgets,
GladeWidget *parent,
GladePlaceholder *placeholder);
GladeWidget *parent,
GladePlaceholder *placeholder);
/************************ signals ******************************/
void glade_command_add_signal (GladeWidget *glade_widget,
const GladeSignal *signal);
const GladeSignal *signal);
void glade_command_remove_signal (GladeWidget *glade_widget,
const GladeSignal *signal);
const GladeSignal *signal);
void glade_command_change_signal (GladeWidget *glade_widget,
const GladeSignal *old_signal,
const GladeSignal *new_signal);
const GladeSignal *old_signal,
const GladeSignal *new_signal);
/************************ set i18n ******************************/
void glade_command_set_i18n (GladeProperty *property,
gboolean translatable,
const gchar *context,
const gchar *comment);
gboolean translatable,
const gchar *context,
const gchar *comment);
G_END_DECLS
......
......@@ -57,7 +57,7 @@ set_cursor_recurse (GtkWidget * widget, GdkCursor * gdk_cursor)
static void
set_cursor (GladeProject *project,
GdkCursor *gdk_cursor)
GdkCursor *gdk_cursor)
{
GList *list;
......@@ -67,10 +67,10 @@ set_cursor (GladeProject *project,
GObject *object = list->data;
if (GTK_IS_WIDGET (object) &&
gtk_widget_get_has_window (GTK_WIDGET (object)))
{
set_cursor_recurse (GTK_WIDGET (object), gdk_cursor);
}
gtk_widget_get_has_window (GTK_WIDGET (object)))
{
set_cursor_recurse (GTK_WIDGET (object), gdk_cursor);
}
}
}
......@@ -84,8 +84,8 @@ set_cursor (GladeProject *project,
*/
void
glade_cursor_set (GladeProject *project,
GdkWindow *window,
GladeCursorType type)
GdkWindow *window,
GladeCursorType type)
{
GladeWidgetAdaptor *adaptor;
GdkCursor *the_cursor = NULL;
......
......@@ -13,42 +13,42 @@ G_BEGIN_DECLS
* is called
*/
typedef struct _GladeCursor {
GdkCursor *selector;
GdkCursor *add_widget; /* fallback cursor if we cannot use widget_class->cursor */