[Xfce4-commits] r26261 - in squeeze/trunk: docs/reference/libsqueeze/tmpl libsqueeze src
Stephan Arts
stephan at xfce.org
Mon Nov 5 20:46:37 CET 2007
Author: stephan
Date: 2007-11-05 19:46:36 +0000 (Mon, 05 Nov 2007)
New Revision: 26261
Modified:
squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/parser-context.h
squeeze/trunk/libsqueeze/parser.h
squeeze/trunk/libsqueeze/scanf-parser.c
squeeze/trunk/libsqueeze/support-template.c
squeeze/trunk/libsqueeze/support-template.h
squeeze/trunk/src/application.c
squeeze/trunk/src/application.h
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/archive_store.h
squeeze/trunk/src/button_drag_box.h
squeeze/trunk/src/extract_dialog.h
squeeze/trunk/src/main_window.c
squeeze/trunk/src/main_window.h
squeeze/trunk/src/message_dialog.h
squeeze/trunk/src/navigation_bar.c
squeeze/trunk/src/navigation_bar.h
squeeze/trunk/src/new_dialog.c
squeeze/trunk/src/new_dialog.h
squeeze/trunk/src/notebook.c
squeeze/trunk/src/notebook.h
squeeze/trunk/src/path_bar.h
squeeze/trunk/src/preferences_dialog.h
squeeze/trunk/src/properties_dialog.c
squeeze/trunk/src/properties_dialog.h
squeeze/trunk/src/settings.h
squeeze/trunk/src/throbber.c
squeeze/trunk/src/throbber.h
squeeze/trunk/src/tool_bar.h
squeeze/trunk/src/widget_factory.c
squeeze/trunk/src/widget_factory.h
Log:
Fix funky indent (sort of)
fix -Wall -Werror compile
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml 2007-11-05 19:46:36 UTC (rev 26261)
@@ -146,3 +146,13 @@
@Returns:
+<!-- ##### FUNCTION lsq_archive_set_property_type ##### -->
+<para>
+
+</para>
+
+ at archive:
+ at n:
+ at type:
+
+
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml 2007-11-05 19:46:36 UTC (rev 26261)
@@ -257,16 +257,6 @@
@archive:
@Returns:
-<!-- ##### FUNCTION lsq_archive_set_property_type ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
-
<!-- ##### FUNCTION lsq_archive_set_property_typesv ##### -->
<para>
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/archive.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -124,7 +124,7 @@
#ifdef LSQ_THREADSAFE
g_static_rw_lock_init(&archive->rw_lock);
#endif /* LSQ_THREADSAFE */
- archive->priv = g_new0(LSQArchivePrivate, 1);
+ archive->priv = g_new0(LSQArchivePrivate, 1);
}
/** static void
@@ -384,6 +384,6 @@
{
if (n >= LSQ_ARCHIVE_PROP_USER)
{
- lsq_support_template_set_property_type(archive->priv->s_template, n, type);
+ lsq_support_template_set_property_type(archive->priv->s_template, n, type);
}
}
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/archive.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -104,7 +104,7 @@
gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType type);
void
-lsq_archvie_set_property_type(LSQArchive *archive, guint n, GType type);
+lsq_archive_set_property_type(LSQArchive *archive, guint n, GType type);
Modified: squeeze/trunk/libsqueeze/parser-context.h
===================================================================
--- squeeze/trunk/libsqueeze/parser-context.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/parser-context.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,18 +20,18 @@
#define LSQ_PARSER_CONTEXT_TYPE lsq_parser_context_get_type()
-#define LSQ_PARSER_CONTEXT(obj) ( \
+#define LSQ_PARSER_CONTEXT(obj) ( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_PARSER_CONTEXT_TYPE, \
+ LSQ_PARSER_CONTEXT_TYPE, \
LSQParserContext))
-#define LSQ_IS_PARSER_CONTEXT(obj) ( \
+#define LSQ_IS_PARSER_CONTEXT(obj) ( \
G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_PARSER_CONTEXT_TYPE))
-#define LSQ_PARSER_CONTEXT_CLASS(class) ( \
+#define LSQ_PARSER_CONTEXT_CLASS(class) ( \
G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_PARSER_CONTEXT_TYPE, \
+ LSQ_PARSER_CONTEXT_TYPE, \
LSQParserContextClass))
#define LSQ_IS_PARSER_CONTEXT_CLASS(class) ( \
@@ -57,11 +57,11 @@
GObjectClass parent;
};
-GType lsq_parser_context_get_type (void);
+GType lsq_parser_context_get_type (void);
-LSQParserContext *lsq_parser_context_new (LSQArchive *archive);
+LSQParserContext *lsq_parser_context_new (LSQArchive *archive);
-gboolean lsq_parser_context_get_line (LSQParserContext *, gchar **, gsize *);
+gboolean lsq_parser_context_get_line (LSQParserContext *, gchar **, gsize *);
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/parser.h
===================================================================
--- squeeze/trunk/libsqueeze/parser.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/parser.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,28 +20,28 @@
#define LSQ_TYPE_PARSER lsq_parser_get_type()
-#define LSQ_PARSER(obj) ( \
+#define LSQ_PARSER(obj) ( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_PARSER, \
+ LSQ_TYPE_PARSER, \
LSQParser))
-#define LSQ_IS_PARSER(obj) ( \
+#define LSQ_IS_PARSER(obj) ( \
G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_PARSER))
-#define LSQ_PARSER_CLASS(class) ( \
+#define LSQ_PARSER_CLASS(class) ( \
G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_PARSER, \
+ LSQ_TYPE_PARSER, \
LSQParserClass))
#define LSQ_IS_PARSER_CLASS(class) ( \
G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_PARSER))
-#define LSQ_PARSER_GET_CLASS(obj) ( \
+#define LSQ_PARSER_GET_CLASS(obj) ( \
G_TYPE_INSTANCE_GET_CLASS ((obj), \
- LSQ_TYPE_PARSER, \
- LSQParserClass))
+ LSQ_TYPE_PARSER, \
+ LSQParserClass))
typedef struct _LSQParser LSQParser;
Modified: squeeze/trunk/libsqueeze/scanf-parser.c
===================================================================
--- squeeze/trunk/libsqueeze/scanf-parser.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/scanf-parser.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -46,15 +46,15 @@
gchar *filename;
LSQParserContext parser;
union {
- gchar c;
- gint i;
- guint u;
- glong l;
- gulong ul;
- gint64 ll;
- guint64 ull;
- gfloat f;
- gdouble d;
+ gchar c;
+ gint i;
+ guint u;
+ glong l;
+ gulong ul;
+ gint64 ll;
+ guint64 ull;
+ gfloat f;
+ gdouble d;
} *data_store;
gpointer *props_store;
};
@@ -266,7 +266,7 @@
/*{{{ parse functions*/
#define DEF_PARSE_BIN(func, bytes, type, ptype, pname) \
guint parse_##func(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx) { \
- type val; \
+ type val; \
ptype *pval; \
if(lng < bytes) return 0; \
val = *((type*)str); \
@@ -280,14 +280,14 @@
guint parse_##func(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx) { \
gchar *ptr; \
gchar *ptr2; \
- type val; \
+ type val; \
ptype *pval; \
if(!lng) return 0; \
pval = &ctx->data_store[part->index].pname; \
ctx->props_store[part->index] = pval; \
if(!part->delimiter[0]) { \
val = g_ascii_strtoll(str, &ptr, base); \
- *pval = val; \
+ *pval = val; \
return ptr - str; \
} \
for(ptr = str; g_ascii_isspace(*ptr); ptr++); \
@@ -302,14 +302,14 @@
guint parse_##func(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx) { \
gchar *ptr; \
gchar *ptr2; \
- type val; \
+ type val; \
type *pval; \
if(!lng) return 0; \
pval = &ctx->data_store[part->index].pname; \
ctx->props_store[part->index] = pval; \
if(!part->delimiter[0]) { \
val = g_ascii_strtod(str, &ptr); \
- *pval = val; \
+ *pval = val; \
return ptr - str; \
} \
for(ptr = str; g_ascii_isspace(*ptr); ptr++); \
@@ -324,14 +324,14 @@
guint parse_##func(gchar *str, guint lng, parse_part *part, LSQScanfParserContext *ctx) { \
gchar *ptr; \
gchar *ptr2; \
- type val; \
+ type val; \
ptype *pval; \
if(!lng) return 0; \
pval = &ctx->data_store[part->index].pname; \
ctx->props_store[part->index] = pval; \
if(!part->delimiter[0]) { \
val = g_ascii_strtoull(str, &ptr, base); \
- *pval = val; \
+ *pval = val; \
return ptr - str; \
} \
for(ptr = str; g_ascii_isspace(*ptr); ptr++); \
@@ -361,8 +361,8 @@
if(!part->delimiter[0])
{
- val = *str;
- *pval = val;
+ val = *str;
+ *pval = val;
return 1;
}
@@ -601,7 +601,7 @@
part = g_new0(parse_part, 1);
parts = g_slist_prepend(parts, part);
cur = ++ptr;
- continue;
+ continue;
}
if(ch == '%')
{
@@ -611,7 +611,7 @@
index = part_count;
if(!(ch = *ptr++))
- break;
+ break;
if(ch == '%')
continue;
@@ -626,8 +626,8 @@
{
ptr = pos+1;
index = index_flag-1;
- if(!(ch = *ptr++))
- break;
+ if(!(ch = *ptr++))
+ break;
}
}
/*}}}*/
@@ -636,8 +636,8 @@
if(ch == '*')
{
skip_flag = TRUE;
- if(!(ch = *ptr++))
- break;
+ if(!(ch = *ptr++))
+ break;
}
/*}}}*/
@@ -645,9 +645,9 @@
//ignored for now
if(g_ascii_isdigit(ch))
{
- width_flag = strtoul(ptr-1, &ptr, 10);
- if(!(ch = *ptr++))
- break;
+ width_flag = g_ascii_strtoull(ptr-1, (gchar **)&ptr, 10);
+ if(!(ch = *ptr++))
+ break;
}
/*}}}*/
@@ -668,8 +668,8 @@
ch = *ptr++;
break;
}
- if(!ch)
- break;
+ if(!ch)
+ break;
/*}}}*/
switch(ch)
@@ -803,6 +803,8 @@
part->function = parse_double;
lsq_archive_set_property_type(archive, index, G_TYPE_DOUBLE);
break;
+ default:
+ break;
}
}
parts = g_slist_prepend(parts, part);
@@ -952,7 +954,7 @@
}
-parse()
+void parse()
{
}
Modified: squeeze/trunk/libsqueeze/support-template.c
===================================================================
--- squeeze/trunk/libsqueeze/support-template.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/support-template.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -26,22 +26,22 @@
GType
lsq_support_template_get_property_type(LSQSupportTemplate *templ, guint nr)
{
- g_return_val_if_fail(nr >= templ->n_properties, G_TYPE_NONE);
- return templ->property_types[nr];
+ g_return_val_if_fail(nr >= templ->n_properties, G_TYPE_NONE);
+ return templ->property_types[nr];
}
const gchar *
lsq_support_template_get_property_name(LSQSupportTemplate *templ, guint nr)
{
- g_return_val_if_fail(nr >= templ->n_properties, NULL);
- return templ->property_names[nr];
+ g_return_val_if_fail(nr >= templ->n_properties, NULL);
+ return templ->property_names[nr];
}
guint
lsq_support_template_get_n_properties (LSQSupportTemplate *templ)
{
- g_return_val_if_fail(templ->n_properties >= 0, 0);
- return templ->n_properties;
+ g_return_val_if_fail(templ->n_properties >= 0, 0);
+ return templ->n_properties;
}
Modified: squeeze/trunk/libsqueeze/support-template.h
===================================================================
--- squeeze/trunk/libsqueeze/support-template.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/libsqueeze/support-template.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -43,9 +43,9 @@
gchar **required_apps;
gboolean supported;
- guint n_properties;
- GType *property_types;
- gchar **property_names;
+ guint n_properties;
+ GType *property_types;
+ gchar **property_names;
gchar **new_cmd_queue;
gchar **add_cmd_queue;
Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/application.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -83,8 +83,8 @@
sq_application_class_init(SQApplicationClass *application_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (application_class);
- object_class->finalize = sq_application_finalize;
- object_class->dispose = sq_application_dispose;
+ object_class->finalize = sq_application_finalize;
+ object_class->dispose = sq_application_dispose;
sq_application_signals[SQ_APPLICATION_SIGNAL_DESTROY] = g_signal_new("destroy",
G_TYPE_FROM_CLASS(application_class),
@@ -185,10 +185,10 @@
if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_EXTRACT))
{
GtkWidget *warning_dialog = gtk_message_dialog_new(NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- _("Squeeze cannot extract this archive type,\nthe application to support this is missing."));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ _("Squeeze cannot extract this archive type,\nthe application to support this is missing."));
if(warning_dialog)
{
gtk_dialog_run (GTK_DIALOG (warning_dialog) );
Modified: squeeze/trunk/src/application.h
===================================================================
--- squeeze/trunk/src/application.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/application.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_APPLICATION sq_application_get_type()
-#define SQ_APPLICATION(obj)( \
+#define SQ_APPLICATION(obj)( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_APPLICATION, \
+ SQ_TYPE_APPLICATION, \
SQApplication))
-#define SQ_IS_APPLICATION(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_APPLICATION(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_APPLICATION))
#define SQ_APPLICATION_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- SQ_TYPE_APPLICATION, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ SQ_TYPE_APPLICATION, \
SQApplicationClass))
#define SQ_IS_APPLICATION_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_APPLICATION()))
typedef struct _SQApplication SQApplication;
@@ -57,7 +57,7 @@
GObjectClass parent_class;
};
-GType sq_application_get_type();
+GType sq_application_get_type();
SQApplication *sq_application_new(GtkIconTheme *icon_theme);
GtkWidget *sq_application_new_window(SQApplication *);
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/archive_store.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -136,7 +136,7 @@
static void
cb_sq_archive_store_archive_refreshed(LSQArchive *archive, gpointer user_data);
-/* static void */
+/* static void */
/* cb_sq_archive_store_archive_path_changed(LSQArchive *archive, const gchar *path, gpointer user_data); */
GType
@@ -189,26 +189,26 @@
static void
sq_archive_tree_model_init(GtkTreeModelIface *iface)
{
- iface->get_flags = sq_archive_store_get_flags;
+ iface->get_flags = sq_archive_store_get_flags;
iface->get_n_columns = sq_archive_store_get_n_columns;
iface->get_column_type = sq_archive_store_get_column_type;
- iface->get_iter = sq_archive_store_get_iter;
- iface->get_path = sq_archive_store_get_path;
- iface->get_value = sq_archive_store_get_value;
- iface->iter_next = sq_archive_store_iter_next;
+ iface->get_iter = sq_archive_store_get_iter;
+ iface->get_path = sq_archive_store_get_path;
+ iface->get_value = sq_archive_store_get_value;
+ iface->iter_next = sq_archive_store_iter_next;
iface->iter_children = sq_archive_store_iter_children;
iface->iter_has_child = sq_archive_store_iter_has_child;
iface->iter_n_children = sq_archive_store_iter_n_children;
iface->iter_nth_child = sq_archive_store_iter_nth_child;
- iface->iter_parent = sq_archive_store_iter_parent;
+ iface->iter_parent = sq_archive_store_iter_parent;
}
static void
sq_archive_tree_sortable_init(GtkTreeSortableIface *iface)
{
- iface->get_sort_column_id = sq_archive_store_get_sort_column_id;
- iface->set_sort_column_id = sq_archive_store_set_sort_column_id;
- iface->set_sort_func = sq_archive_store_set_sort_func; /*NOT SUPPORTED*/
+ iface->get_sort_column_id = sq_archive_store_get_sort_column_id;
+ iface->set_sort_column_id = sq_archive_store_set_sort_column_id;
+ iface->set_sort_func = sq_archive_store_set_sort_func; /*NOT SUPPORTED*/
iface->set_default_sort_func = sq_archive_store_set_default_sort_func; /*NOT SUPPORTED*/
iface->has_default_sort_func = sq_archive_store_has_default_sort_func;
}
Modified: squeeze/trunk/src/archive_store.h
===================================================================
--- squeeze/trunk/src/archive_store.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/archive_store.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -18,22 +18,22 @@
#define SQ_TYPE_ARCHIVE_STORE sq_archive_store_get_type()
-#define SQ_ARCHIVE_STORE(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_ARCHIVE_STORE, \
+#define SQ_ARCHIVE_STORE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ SQ_TYPE_ARCHIVE_STORE, \
SQArchiveStore))
-#define SQ_IS_ARCHIVE_STORE(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_ARCHIVE_STORE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_ARCHIVE_STORE))
#define SQ_ARCHIVE_STORE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- SQ_TYPE_ARCHIVE_STORE, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ SQ_TYPE_ARCHIVE_STORE, \
SQArchiveStoreClass))
#define SQ_IS_ARCHIVE_STORE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_ARCHIVE_STORE))
typedef struct _SQArchiveStore SQArchiveStore;
Modified: squeeze/trunk/src/button_drag_box.h
===================================================================
--- squeeze/trunk/src/button_drag_box.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/button_drag_box.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -22,22 +22,22 @@
#define SQ_TYPE_BUTTON_DRAG_BOX sq_button_drag_box_get_type()
-#define SQ_BUTTON_DRAG_BOX(obj)( \
+#define SQ_BUTTON_DRAG_BOX(obj)( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_BUTTON_DRAG_BOX, \
+ SQ_TYPE_BUTTON_DRAG_BOX, \
SQButtonDragBox))
-#define SQ_IS_BUTTON_DRAG_BOX(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_BUTTON_DRAG_BOX(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_BUTTON_DRAG_BOX))
#define SQ_BUTTON_DRAG_BOX_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- SQ_TYPE_BUTTON_DRAG_BOX, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ SQ_TYPE_BUTTON_DRAG_BOX, \
SQButtonDragBoxClass))
#define SQ_IS_BUTTON_DRAG_BOX_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_BUTTON_DRAG_BOX()))
typedef struct _SQButtonDragBox SQButtonDragBox;
@@ -59,15 +59,15 @@
GtkVBoxClass parent_class;
};
-GType sq_button_drag_box_get_type();
+GType sq_button_drag_box_get_type();
GtkWidget *sq_button_drag_box_new();
-void sq_button_drag_box_lock_buttons(SQButtonDragBox *box, guint buttons);
-void sq_button_drag_box_add_fixed_button(SQButtonDragBox *box, const gchar *label, gpointer user_data);
-void sq_button_drag_box_add_button(SQButtonDragBox *box, const gchar *label, gboolean visible, gpointer user_data);
+void sq_button_drag_box_lock_buttons(SQButtonDragBox *box, guint buttons);
+void sq_button_drag_box_add_fixed_button(SQButtonDragBox *box, const gchar *label, gpointer user_data);
+void sq_button_drag_box_add_button(SQButtonDragBox *box, const gchar *label, gboolean visible, gpointer user_data);
-GSList *sq_button_drag_box_get_visible(SQButtonDragBox *box);
-GSList *sq_button_drag_box_get_hidden(SQButtonDragBox *box);
+GSList *sq_button_drag_box_get_visible(SQButtonDragBox *box);
+GSList *sq_button_drag_box_get_hidden(SQButtonDragBox *box);
G_END_DECLS
#endif /* __SQRCHIVER_BUTTON_DRAG_BOX_H__*/
Modified: squeeze/trunk/src/extract_dialog.h
===================================================================
--- squeeze/trunk/src/extract_dialog.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/extract_dialog.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -18,22 +18,22 @@
#define __SQRCHIVER_EXTRACT_ARCHIVE_DIALOG_H__
G_BEGIN_DECLS
-#define SQ_EXTRACT_ARCHIVE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_extract_archive_dialog_get_type(), \
+#define SQ_EXTRACT_ARCHIVE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_extract_archive_dialog_get_type(), \
SQExtractArchiveDialog))
-#define SQ_IS_EXTRACT_ARCHIVE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_EXTRACT_ARCHIVE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_extract_archive_dialog_get_type()))
#define SQ_EXTRACT_ARCHIVE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_extract_archive_dialog_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_extract_archive_dialog_get_type(), \
SQExtractArchiveDialogClass))
#define SQ_IS_EXTRACT_ARCHIVE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_extract_archive_dialog_get_type()))
typedef struct _SQExtractArchiveDialog SQExtractArchiveDialog;
@@ -55,7 +55,7 @@
GtkFileChooserDialogClass parent_class;
};
-GType sq_extract_archive_dialog_get_type();
+GType sq_extract_archive_dialog_get_type();
GtkWidget *sq_extract_archive_dialog_new(LSQArchive *, gboolean);
G_END_DECLS
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/main_window.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -176,7 +176,7 @@
object_class->set_property = sq_main_window_set_property;
object_class->get_property = sq_main_window_get_property;
- object_class->dispose = sq_main_window_dispose;
+ object_class->dispose = sq_main_window_dispose;
pspec = g_param_spec_enum("navigation-style",
_("Navigation Style"),
@@ -262,10 +262,10 @@
sq_main_window_init(SQMainWindow *window)
{
GtkToolItem *tool_separator;
- GtkWidget *menu_separator;
- GtkWidget *tmp_image;
+ GtkWidget *menu_separator;
+ GtkWidget *tmp_image;
const gchar *nav_bar;
- GSList *list, *iter;
+ GSList *list, *iter;
gboolean up_dir = TRUE;
gboolean use_tabs = TRUE;
gboolean show_menubar = TRUE;
@@ -284,8 +284,8 @@
show_menubar = sq_settings_read_bool_entry(window->settings, "MenuBar", TRUE);
gtk_window_set_default_size (GTK_WINDOW(window),
- sq_settings_read_int_entry(window->settings, "LastWindowWidth", 500),
- sq_settings_read_int_entry(window->settings, "LastWindowHeight", 300));
+ sq_settings_read_int_entry(window->settings, "LastWindowWidth", 500),
+ sq_settings_read_int_entry(window->settings, "LastWindowHeight", 300));
if(show_menubar)
{
@@ -357,17 +357,17 @@
g_signal_connect(G_OBJECT(window->menubar.menu_item_refresh), "activate", G_CALLBACK(cb_sq_main_refresh_archive), window);
gtk_widget_add_accelerator (window->menubar.menu_item_refresh,
- "activate",
- window->accel_group,
- GDK_F5,
- 0,
- GTK_ACCEL_LOCKED | GTK_ACCEL_MASK);
+ "activate",
+ window->accel_group,
+ GDK_F5,
+ 0,
+ GTK_ACCEL_LOCKED | GTK_ACCEL_MASK);
gtk_widget_add_accelerator (window->menubar.menu_item_refresh,
- "activate",
- window->accel_group,
- GDK_r,
- GDK_CONTROL_MASK,
- GTK_ACCEL_LOCKED | GTK_ACCEL_MASK);
+ "activate",
+ window->accel_group,
+ GDK_r,
+ GDK_CONTROL_MASK,
+ GTK_ACCEL_LOCKED | GTK_ACCEL_MASK);
/* View menu */
window->menubar.menu_item_view = gtk_menu_item_new_with_mnemonic(_("_View"));
@@ -722,20 +722,20 @@
if(mod_type & GDK_SHIFT_MASK)
dialog = gtk_file_chooser_dialog_new(_("Open archive in new window"),
- GTK_WINDOW(window),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+ GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
else
dialog = gtk_file_chooser_dialog_new(_("Open archive"),
- GTK_WINDOW(window),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+ GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
- /*
+ /*
GSList *supported_mime_types = lsq_get_supported_mime_types(0);
GSList *_supported_mime_types = supported_mime_types;
@@ -745,20 +745,20 @@
{
GtkFileFilter *filter = gtk_file_filter_new();
gtk_file_filter_add_mime_type(filter,
- lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
+ lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
gtk_file_filter_set_name(filter, lsq_mime_support_get_comment((LSQMimeSupport *)(_supported_mime_types->data)));
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
gtk_file_filter_add_mime_type(filter_all,
- lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
+ lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
_supported_mime_types = g_slist_next(_supported_mime_types);
}
g_slist_free(supported_mime_types);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter_all);
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter_all);
- */
+ */
result = gtk_dialog_run (GTK_DIALOG (dialog) );
@@ -800,7 +800,7 @@
gint result = 0;
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
- LSQArchive *lp_archive = NULL;
+ LSQArchive *lp_archive = NULL;
GSList *filenames = sq_notebook_get_selected_items(SQ_NOTEBOOK(window->notebook));
@@ -820,7 +820,7 @@
if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_EXTRACT))
{
GtkWidget *warning_dialog = gtk_message_dialog_new(GTK_WINDOW(window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CLOSE,
_("Squeeze cannot extract this archive type,\nthe application to support this is missing."));
@@ -843,20 +843,20 @@
{
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
- LSQArchive *lp_archive = NULL;
- GtkWidget *dialog = NULL;
- GSList *filenames = NULL;
+ LSQArchive *lp_archive = NULL;
+ GtkWidget *dialog = NULL;
+ GSList *filenames = NULL;
gint result;
sq_notebook_get_active_archive(SQ_NOTEBOOK(window->notebook), &lp_archive);
dialog = gtk_file_chooser_dialog_new(_("Add files"),
- GTK_WINDOW(window),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_OK,
- NULL);
+ GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN,
+ GTK_RESPONSE_OK,
+ NULL);
result = gtk_dialog_run (GTK_DIALOG(dialog));
if(result == GTK_RESPONSE_OK)
@@ -885,20 +885,20 @@
{
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
- LSQArchive *lp_archive = NULL;
- GtkWidget *dialog = NULL;
- GSList *filenames = NULL;
+ LSQArchive *lp_archive = NULL;
+ GtkWidget *dialog = NULL;
+ GSList *filenames = NULL;
gint result;
sq_notebook_get_active_archive(SQ_NOTEBOOK(window->notebook), &lp_archive);
dialog = gtk_file_chooser_dialog_new(_("Add folders"),
- GTK_WINDOW(window),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_OK,
- NULL);
+ GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN,
+ GTK_RESPONSE_OK,
+ NULL);
result = gtk_dialog_run (GTK_DIALOG(dialog));
if(result == GTK_RESPONSE_OK)
@@ -910,11 +910,11 @@
if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_ADD))
{
GtkWidget *warning_dialog = gtk_message_dialog_new(GTK_WINDOW(window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- _("Squeeze cannot add folders to this archive type,\n"
- "the application to support this is missing."));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ _("Squeeze cannot add folders to this archive type,\n"
+ "the application to support this is missing."));
gtk_dialog_run (GTK_DIALOG (warning_dialog) );
gtk_widget_destroy(warning_dialog);
}
@@ -927,7 +927,7 @@
cb_sq_main_remove_from_archive(GtkWidget *widget, gpointer userdata)
{
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
- LSQArchive *lp_archive = NULL;
+ LSQArchive *lp_archive = NULL;
GtkWidget *dialog = NULL;
gint result = 0;
GSList *filenames = sq_notebook_get_selected_items(SQ_NOTEBOOK(window->notebook));
@@ -986,8 +986,8 @@
{
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
- LSQArchive *lp_archive = NULL;
- GtkWidget *dialog = NULL;
+ LSQArchive *lp_archive = NULL;
+ GtkWidget *dialog = NULL;
gint result = 0;
sq_notebook_get_active_archive(SQ_NOTEBOOK(window->notebook), &lp_archive);
@@ -996,7 +996,7 @@
else
{
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
- _("Are you sure you want to cancel this operation?\nThis could damage the archive."));
+ _("Are you sure you want to cancel this operation?\nThis could damage the archive."));
result = gtk_dialog_run(GTK_DIALOG(dialog));
if(result == GTK_RESPONSE_YES)
{
Modified: squeeze/trunk/src/main_window.h
===================================================================
--- squeeze/trunk/src/main_window.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/main_window.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -42,22 +42,22 @@
#define SQ_TYPE_MAIN_WINDOW sq_main_window_get_type()
-#define SQ_MAIN_WINDOW(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_main_window_get_type(), \
+#define SQ_MAIN_WINDOW(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_main_window_get_type(), \
SQMainWindow))
-#define SQ_IS_MAIN_WINDOW(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_MAIN_WINDOW(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_main_window_get_type()))
#define SQ_MAIN_WINDOW_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_main_window_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_main_window_get_type(), \
SQMainWindowClass))
#define SQ_IS_MAIN_WINDOW_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_main_window_get_type()))
typedef struct _SQMainWindow SQMainWindow;
@@ -138,11 +138,11 @@
GtkWindowClass parent;
};
-GType sq_main_window_navigation_style_get_type();
+GType sq_main_window_navigation_style_get_type();
GtkWidget *sq_main_window_new(SQApplication *, GtkIconTheme *icon_theme);
GtkWidget *sq_main_window_find_image(gchar *, GtkIconSize);
-GType sq_main_window_get_type ();
+GType sq_main_window_get_type ();
gint sq_main_window_open_archive(SQMainWindow *window, gchar *path, gint replace);
Modified: squeeze/trunk/src/message_dialog.h
===================================================================
--- squeeze/trunk/src/message_dialog.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/message_dialog.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -18,22 +18,22 @@
#define __SQRCHIVER_MESSAGE_DIALOG_H__
G_BEGIN_DECLS
-#define SQ_MESSAGE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_message_dialog_get_type(), \
+#define SQ_MESSAGE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_message_dialog_get_type(), \
SQMessageDialog))
-#define SQ_IS_MESSAGE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_MESSAGE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_message_dialog_get_type()))
#define SQ_MESSAGE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_message_dialog_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_message_dialog_get_type(), \
SQMessageDialogClass))
#define SQ_IS_MESSAGE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_message_dialog_get_type()))
typedef struct _SQMessageDialog SQMessageDialog;
@@ -53,7 +53,7 @@
GtkWindowClass parent;
};
-GType sq_message_dialog_get_type();
+GType sq_message_dialog_get_type();
GtkWidget *sq_message_dialog_new();
G_END_DECLS
Modified: squeeze/trunk/src/navigation_bar.c
===================================================================
--- squeeze/trunk/src/navigation_bar.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/navigation_bar.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -78,7 +78,7 @@
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
- object_class->dispose = sq_navigation_bar_dispose;
+ object_class->dispose = sq_navigation_bar_dispose;
}
static void
Modified: squeeze/trunk/src/navigation_bar.h
===================================================================
--- squeeze/trunk/src/navigation_bar.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/navigation_bar.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_NAVIGATION_BAR sq_navigation_bar_get_type()
-#define SQ_NAVIGATION_BAR(obj)( \
+#define SQ_NAVIGATION_BAR(obj)( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_NAVIGATION_BAR, \
+ SQ_TYPE_NAVIGATION_BAR, \
SQNavigationBar))
-#define SQ_IS_NAVIGATION_BAR(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_NAVIGATION_BAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_NAVIGATION_BAR))
#define SQ_NAVIGATION_BAR_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- SQ_TYPE_NAVIGATION_BAR, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ SQ_TYPE_NAVIGATION_BAR, \
SQNavigationBarClass))
#define SQ_IS_NAVIGATION_BAR_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_NAVIGATION_BAR()))
typedef struct _SQNavigationBar SQNavigationBar;
@@ -56,9 +56,9 @@
GtkToolbarClass parent_class;
};
-GType sq_navigation_bar_get_type();
+GType sq_navigation_bar_get_type();
SQNavigationBar *sq_navigation_bar_new();
-void sq_navigation_bar_set_store(SQNavigationBar *navigation_bar, SQArchiveStore *store);
+void sq_navigation_bar_set_store(SQNavigationBar *navigation_bar, SQArchiveStore *store);
G_END_DECLS
#endif /* __SQRCHIVER_NAVIGATION_BAR_H__*/
Modified: squeeze/trunk/src/new_dialog.c
===================================================================
--- squeeze/trunk/src/new_dialog.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/new_dialog.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -80,15 +80,15 @@
gtk_file_filter_set_name(dialog->file_filter, _("Archives"));
while(_supported_mime_types)
{
- /*
+ /*
gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->archive_types_combo),
- lsq_mime_support_get_comment((LSQMimeSupport *)(_supported_mime_types->data)));
+ lsq_mime_support_get_comment((LSQMimeSupport *)(_supported_mime_types->data)));
gtk_file_filter_add_mime_type(dialog->file_filter,
- lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
+ lsq_mime_support_get_name((LSQMimeSupport *)(_supported_mime_types->data)));
_supported_mime_types = g_slist_next(_supported_mime_types);
- */
+ */
}
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 0);
Modified: squeeze/trunk/src/new_dialog.h
===================================================================
--- squeeze/trunk/src/new_dialog.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/new_dialog.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define __SQRCHIVER_NEW_ARCHIVE_DIALOG_H__
G_BEGIN_DECLS
-#define SQ_NEW_ARCHIVE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_new_archive_dialog_get_type(), \
+#define SQ_NEW_ARCHIVE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_new_archive_dialog_get_type(), \
SQNewArchiveDialog))
-#define SQ_IS_NEW_ARCHIVE_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_NEW_ARCHIVE_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_new_archive_dialog_get_type()))
#define SQ_NEW_ARCHIVE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_new_archive_dialog_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_new_archive_dialog_get_type(), \
SQNewArchiveDialogClass))
#define SQ_IS_NEW_ARCHIVE_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_new_archive_dialog_get_type()))
typedef struct _SQNewArchiveDialog SQNewArchiveDialog;
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/notebook.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -128,7 +128,7 @@
object_class->set_property = sq_notebook_set_property;
object_class->get_property = sq_notebook_get_property;
- object_class->dispose = sq_notebook_dispose;
+ object_class->dispose = sq_notebook_dispose;
sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_ARCHIVE_REMOVED] = g_signal_new("archive-removed",
G_TYPE_FROM_CLASS(notebook_class),
Modified: squeeze/trunk/src/notebook.h
===================================================================
--- squeeze/trunk/src/notebook.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/notebook.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_NOTEBOOK sq_notebook_get_type()
-#define SQ_NOTEBOOK(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_notebook_get_type(), \
+#define SQ_NOTEBOOK(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_notebook_get_type(), \
SQNotebook))
-#define SQ_IS_NOTEBOOK(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_NOTEBOOK(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_notebook_get_type()))
#define SQ_NOTEBOOK_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_notebook_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_notebook_get_type(), \
SQNotebookClass))
#define SQ_IS_NOTEBOOK_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_notebook_get_type()))
typedef struct _SQNotebook SQNotebook;
@@ -69,22 +69,22 @@
};
GtkWidget *sq_notebook_new (SQNavigationBar *, gboolean , GtkAccelGroup *);
-GType sq_notebook_get_type ();
+GType sq_notebook_get_type ();
-void sq_notebook_set_navigation_bar(SQNotebook *, SQNavigationBar *);
-void sq_notebook_add_archive(SQNotebook *, LSQArchive *, gboolean);
-void sq_notebook_page_set_archive(SQNotebook *, LSQArchive *, gint n);
-void sq_notebook_page_get_archive(SQNotebook *, LSQArchive **, gint n);
-void sq_notebook_set_icon_theme(SQNotebook *, GtkIconTheme *);
-void sq_notebook_get_active_archive(SQNotebook *, LSQArchive **);
-gboolean sq_notebook_is_active_archive(SQNotebook *, LSQArchive *);
+void sq_notebook_set_navigation_bar(SQNotebook *, SQNavigationBar *);
+void sq_notebook_add_archive(SQNotebook *, LSQArchive *, gboolean);
+void sq_notebook_page_set_archive(SQNotebook *, LSQArchive *, gint n);
+void sq_notebook_page_get_archive(SQNotebook *, LSQArchive **, gint n);
+void sq_notebook_set_icon_theme(SQNotebook *, GtkIconTheme *);
+void sq_notebook_get_active_archive(SQNotebook *, LSQArchive **);
+gboolean sq_notebook_is_active_archive(SQNotebook *, LSQArchive *);
GtkWidget *sq_notebook_get_active_child(SQNotebook *notebook);
SQArchiveStore *sq_notebook_get_active_store(SQNotebook *notebook);
GtkTreeView *sq_notebook_get_active_tree_view(SQNotebook *notebook);
-gboolean sq_notebook_get_multi_tab(SQNotebook *notebook);
-void sq_notebook_close_active_archive(SQNotebook *);
+gboolean sq_notebook_get_multi_tab(SQNotebook *notebook);
+void sq_notebook_close_active_archive(SQNotebook *);
-GSList *sq_notebook_get_selected_items(SQNotebook *notebook);
+GSList *sq_notebook_get_selected_items(SQNotebook *notebook);
G_END_DECLS
#endif /* __SQRCHIVER_NOTEBOOK_H__ */
Modified: squeeze/trunk/src/path_bar.h
===================================================================
--- squeeze/trunk/src/path_bar.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/path_bar.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_PATH_BAR sq_path_bar_get_type()
-#define SQ_PATH_BAR(obj)( \
+#define SQ_PATH_BAR(obj)( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_PATH_BAR, \
+ SQ_TYPE_PATH_BAR, \
SQPathBar))
-#define SQ_IS_PATH_BAR(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_PATH_BAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_PATH_BAR))
#define SQ_PATH_BAR_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- SQ_TYPE_PATH_BAR, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ SQ_TYPE_PATH_BAR, \
SQPathBarClass))
#define SQ_IS_PATH_BAR_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_PATH_BAR()))
typedef struct _SQPathBar SQPathBar;
@@ -62,7 +62,7 @@
SQNavigationBarClass parent_class;
};
-GType sq_path_bar_get_type();
+GType sq_path_bar_get_type();
SQNavigationBar *sq_path_bar_new(SQArchiveStore *);
G_END_DECLS
Modified: squeeze/trunk/src/preferences_dialog.h
===================================================================
--- squeeze/trunk/src/preferences_dialog.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/preferences_dialog.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -18,22 +18,22 @@
#define __SQRCHIVER_PREFERENCES_DIALOG_H__
G_BEGIN_DECLS
-#define SQ_PREFERENCES_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_preferences_dialog_get_type(), \
+#define SQ_PREFERENCES_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_preferences_dialog_get_type(), \
SQPreferencesDialog))
-#define SQ_IS_PREFERENCES_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_PREFERENCES_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_preferences_dialog_get_type()))
#define SQ_PREFERENCES_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_preferences_dialog_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_preferences_dialog_get_type(), \
SQPreferencesDialogClass))
#define SQ_IS_PREFERENCES_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_preferences_dialog_get_type()))
typedef struct
@@ -71,7 +71,7 @@
GtkDialogClass parent;
};
-GType sq_preferences_dialog_get_type ();
+GType sq_preferences_dialog_get_type ();
GtkWidget *sq_preferences_dialog_new();
G_END_DECLS
Modified: squeeze/trunk/src/properties_dialog.c
===================================================================
--- squeeze/trunk/src/properties_dialog.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/properties_dialog.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -106,7 +106,7 @@
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
}
Modified: squeeze/trunk/src/properties_dialog.h
===================================================================
--- squeeze/trunk/src/properties_dialog.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/properties_dialog.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -23,22 +23,22 @@
#define __SQ_PROPERTIES_DIALOG_H__
G_BEGIN_DECLS
-#define SQ_PROPERTIES_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_properties_dialog_get_type(), \
+#define SQ_PROPERTIES_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_properties_dialog_get_type(), \
SQPropertiesDialog))
-#define SQ_IS_PROPERTIES_DIALOG(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_PROPERTIES_DIALOG(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_properties_dialog_get_type()))
#define SQ_PROPERTIES_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_properties_dialog_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_properties_dialog_get_type(), \
SQPropertiesDialogClass))
#define SQ_IS_PROPERTIES_DIALOG_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_properties_dialog_get_type()))
typedef struct _SQPropertiesDialog SQPropertiesDialog;
Modified: squeeze/trunk/src/settings.h
===================================================================
--- squeeze/trunk/src/settings.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/settings.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_SETTINGS sq_settings_get_type()
-#define SQ_SETTINGS(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_settings_get_type(), \
+#define SQ_SETTINGS(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_settings_get_type(), \
SQSettings))
-#define SQ_IS_SETTINGS(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_SETTINGS(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_settings_get_type()))
#define SQ_SETTINGS_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- sq_settings_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ sq_settings_get_type(), \
SQSettingsClass))
#define SQ_IS_SETTINGS_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
sq_settings_get_type()))
typedef struct _SQSettings SQSettings;
@@ -55,20 +55,20 @@
};
SQSettings *sq_settings_new();
-GType sq_settings_get_type ();
+GType sq_settings_get_type ();
-gboolean sq_settings_load(SQSettings *);
-gboolean sq_settings_save(SQSettings *);
+gboolean sq_settings_load(SQSettings *);
+gboolean sq_settings_save(SQSettings *);
const gchar *sq_settings_read_entry(SQSettings *settings, const gchar *key, const gchar *fallback);
-gboolean sq_settings_read_bool_entry(SQSettings *settings, const gchar *key, const gboolean fallback);
-gint sq_settings_read_int_entry(SQSettings *settings, const gchar *key, const gint fallback);
+gboolean sq_settings_read_bool_entry(SQSettings *settings, const gchar *key, const gboolean fallback);
+gint sq_settings_read_int_entry(SQSettings *settings, const gchar *key, const gint fallback);
-void sq_settings_write_entry(SQSettings *settings, const gchar *key, const gchar *value);
-void sq_settings_write_bool_entry(SQSettings *settings, const gchar *key, const gboolean value);
-void sq_settings_write_int_entry(SQSettings *settings, const gchar *key, const gint value);
+void sq_settings_write_entry(SQSettings *settings, const gchar *key, const gchar *value);
+void sq_settings_write_bool_entry(SQSettings *settings, const gchar *key, const gboolean value);
+void sq_settings_write_int_entry(SQSettings *settings, const gchar *key, const gint value);
-void sq_settings_set_group(SQSettings *settings, const gchar *group);
+void sq_settings_set_group(SQSettings *settings, const gchar *group);
G_END_DECLS
Modified: squeeze/trunk/src/throbber.c
===================================================================
--- squeeze/trunk/src/throbber.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/throbber.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -42,19 +42,19 @@
static void sq_throbber_init(SQThrobber *throbber);
static void sq_throbber_dispose(GObject *object);
static void sq_throbber_get_property(GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void sq_throbber_set_property(GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void sq_throbber_realize(GtkWidget *widget);
static void sq_throbber_unrealize(GtkWidget *widget);
static void sq_throbber_size_request(GtkWidget *widget,
- GtkRequisition *requisition);
+ GtkRequisition *requisition);
static gboolean sq_throbber_expose_event(GtkWidget *widget,
- GdkEventExpose *event);
+ GdkEventExpose *event);
static gboolean sq_throbber_timer(gpointer user_data);
static void sq_throbber_timer_destroy(gpointer user_data);
@@ -72,8 +72,8 @@
GdkPixbuf *icon;
gboolean animated;
- gint index;
- gint timer_id;
+ gint index;
+ gint timer_id;
};
@@ -116,7 +116,7 @@
{
GtkWidgetClass *gtkwidget_class;
GObjectClass *gobject_class;
- GdkPixbuf *icon;
+ GdkPixbuf *icon;
/* determine the parent type class */
sq_throbber_parent_class = g_type_class_peek_parent (klass);
@@ -138,10 +138,10 @@
* Whether the throbber should display an animation.
**/
g_object_class_install_property (gobject_class,
- PROP_ANIMATED,
- g_param_spec_boolean ("animated",
- "animated", "animated", \
- FALSE, EXO_PARAM_READWRITE));
+ PROP_ANIMATED,
+ g_param_spec_boolean ("animated",
+ "animated", "animated", \
+ FALSE, EXO_PARAM_READWRITE));
/* register the "process-working" fallback icon */
icon = gdk_pixbuf_new_from_inline (-1, sq_throbber_fallback, FALSE, NULL);
@@ -176,9 +176,9 @@
static void
sq_throbber_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
SQThrobber *throbber = SQ_THROBBER (object);
@@ -198,9 +198,9 @@
static void
sq_throbber_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
SQThrobber *throbber = SQ_THROBBER (object);
@@ -256,7 +256,7 @@
static void
sq_throbber_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkRequisition *requisition)
{
requisition->width = 16;
requisition->height = 16;
@@ -266,7 +266,7 @@
static gboolean
sq_throbber_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
+ GdkEventExpose *event)
{
SQThrobber *throbber = SQ_THROBBER (widget);
gint icon_index;
@@ -373,7 +373,7 @@
**/
void
sq_throbber_set_animated (SQThrobber *throbber,
- gboolean animated)
+ gboolean animated)
{
g_return_if_fail (SQ_IS_THROBBER (throbber));
@@ -389,7 +389,7 @@
{
/* start the animation */
throbber->timer_id = g_timeout_add_full (G_PRIORITY_LOW, 25, sq_throbber_timer,
- throbber, sq_throbber_timer_destroy);
+ throbber, sq_throbber_timer_destroy);
}
/* schedule a redraw with the new animation state */
Modified: squeeze/trunk/src/throbber.h
===================================================================
--- squeeze/trunk/src/throbber.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/throbber.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -26,7 +26,7 @@
G_BEGIN_DECLS;
typedef struct _SQThrobberClass SQThrobberClass;
-typedef struct _SQThrobber SQThrobber;
+typedef struct _SQThrobber SQThrobber;
#define SQ_TYPE_THROBBER (sq_throbber_get_type ())
#define SQ_THROBBER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SQ_TYPE_THROBBER, SQThrobber))
@@ -41,7 +41,7 @@
gboolean sq_throbber_get_animated (const SQThrobber *throbber);
void sq_throbber_set_animated(SQThrobber *throbber,
- gboolean animated);
+ gboolean animated);
G_END_DECLS;
Modified: squeeze/trunk/src/tool_bar.h
===================================================================
--- squeeze/trunk/src/tool_bar.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/tool_bar.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -20,22 +20,22 @@
#define SQ_TYPE_TOOL_BAR sq_tool_bar_get_type()
-#define SQ_TOOL_BAR(obj)( \
+#define SQ_TOOL_BAR(obj)( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- SQ_TYPE_TOOL_BAR, \
+ SQ_TYPE_TOOL_BAR, \
SQToolBar))
-#define SQ_IS_TOOL_BAR(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define SQ_IS_TOOL_BAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
SQ_TYPE_TOOL_BAR))
#define SQ_TOOL_BAR_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- SQ_TYPE_TOOL_BAR, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ SQ_TYPE_TOOL_BAR, \
SQToolBarClass))
#define SQ_IS_TOOL_BAR_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
SQ_TYPE_TOOL_BAR()))
typedef struct _SQToolBar SQToolBar;
@@ -60,7 +60,7 @@
SQNavigationBarClass parent_class;
};
-GType sq_tool_bar_get_type();
+GType sq_tool_bar_get_type();
SQNavigationBar *sq_tool_bar_new();
G_END_DECLS
Modified: squeeze/trunk/src/widget_factory.c
===================================================================
--- squeeze/trunk/src/widget_factory.c 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/widget_factory.c 2007-11-05 19:46:36 UTC (rev 26261)
@@ -70,10 +70,10 @@
static void
cb_sq_widget_factory_object_destroyed(GtkObject *obj, gpointer user_data);
-/* static void */
+/* static void */
/* cb_sq_widget_factory_action_triggered(GtkWidget *widget, gpointer user_data); */
-/* static void */
+/* static void */
/* sq_widget_factory_notify(LSQCustomAction *action, const gchar *message); */
GType
@@ -112,7 +112,7 @@
sq_widget_factory_init(SQWidgetFactory *factory)
{
factory->tips = gtk_tooltips_new();
- /* factory->custom_callback = g_new(LSQCustomActionCallback, 1); */
+ /* factory->custom_callback = g_new(LSQCustomActionCallback, 1); */
/* factory->custom_callback->notify_func = (LSQCustomActionNotifyFunc)sq_widget_factory_notify; */
}
@@ -935,119 +935,119 @@
g_value_unset(&value);
}
-/* GtkWidget* */
+/* GtkWidget* */
/* sq_widget_factory_create_action_widget(SQWidgetFactory *factory, LSQArchiveSupport *support, LSQArchive *archive, const gchar *act) */
-/* { */
- /* GtkWidget *widget = NULL; */
- /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
+/* { */
+ /* GtkWidget *widget = NULL; */
+ /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
- /* if(!action) */
- /* return NULL; */
+ /* if(!action) */
+ /* return NULL; */
- /* widget = gtk_button_new_with_label(lsq_custom_action_get_nick(action)); */
- /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CUSTOM_DATA, action); */
- /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
- /* g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
+ /* widget = gtk_button_new_with_label(lsq_custom_action_get_nick(action)); */
+ /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CUSTOM_DATA, action); */
+ /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
+ /* g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
- /* const gchar *large_tip = lsq_custom_action_get_blurb(action); */
- /* gchar *small_tip = NULL; */
- /* if(strchr(large_tip, '\n')) */
- /* { */
- /* small_tip = g_strndup(large_tip, strchr(large_tip, '\n') - large_tip); */
- /* large_tip = strchr(large_tip, '\n') + 1; */
- /* } */
+ /* const gchar *large_tip = lsq_custom_action_get_blurb(action); */
+ /* gchar *small_tip = NULL; */
+ /* if(strchr(large_tip, '\n')) */
+ /* { */
+ /* small_tip = g_strndup(large_tip, strchr(large_tip, '\n') - large_tip); */
+ /* large_tip = strchr(large_tip, '\n') + 1; */
+ /* } */
- /* gtk_tooltips_set_tip(factory->tips, widget, small_tip?small_tip:large_tip, large_tip); */
+ /* gtk_tooltips_set_tip(factory->tips, widget, small_tip?small_tip:large_tip, large_tip); */
- /* g_free(small_tip); */
+ /* g_free(small_tip); */
- /* gtk_widget_show(widget); */
+ /* gtk_widget_show(widget); */
- /* return widget; */
-/* } */
+ /* return widget; */
+/* } */
-/* GtkWidget* */
+/* GtkWidget* */
/* sq_widget_factory_create_action_menu_item(SQWidgetFactory *factory, LSQArchiveSupport *support, LSQArchive *archive, const gchar *act) */
-/* { */
- /* GtkWidget *menu; */
- /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
+/* { */
+ /* GtkWidget *menu; */
+ /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
- /* if(!action) */
- /* return NULL; */
+ /* if(!action) */
+ /* return NULL; */
- /* menu = gtk_menu_item_new_with_label(lsq_custom_action_get_nick(action)); */
- /* g_object_set_data(G_OBJECT(menu), SQ_ACTION_CUSTOM_DATA, action); */
- /* g_object_set_data(G_OBJECT(menu), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
- /* g_signal_connect(G_OBJECT(menu), "activate", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
- /* gtk_widget_show(menu); */
+ /* menu = gtk_menu_item_new_with_label(lsq_custom_action_get_nick(action)); */
+ /* g_object_set_data(G_OBJECT(menu), SQ_ACTION_CUSTOM_DATA, action); */
+ /* g_object_set_data(G_OBJECT(menu), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
+ /* g_signal_connect(G_OBJECT(menu), "activate", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
+ /* gtk_widget_show(menu); */
- /* return menu; */
-/* } */
+ /* return menu; */
+/* } */
-/* GtkToolItem* */
+/* GtkToolItem* */
/* sq_widget_factory_create_action_bar(SQWidgetFactory *factory, LSQArchiveSupport *support, LSQArchive *archive, const gchar *act) */
-/* { */
- /* GtkToolItem *widget; */
- /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
+/* { */
+ /* GtkToolItem *widget; */
+ /* LSQCustomAction *action = lsq_archive_support_find_action(support, act); */
- /* if(!action) */
- /* return NULL; */
+ /* if(!action) */
+ /* return NULL; */
- /* widget = gtk_tool_button_new(NULL, lsq_custom_action_get_nick(action)); */
- /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CUSTOM_DATA, action); */
- /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
- /* g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
+ /* widget = gtk_tool_button_new(NULL, lsq_custom_action_get_nick(action)); */
+ /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CUSTOM_DATA, action); */
+ /* g_object_set_data(G_OBJECT(widget), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
+ /* g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
- /* const gchar *large_tip = lsq_custom_action_get_blurb(action); */
- /* gchar *small_tip = NULL; */
- /* if(strchr(large_tip, '\n')) */
- /* { */
- /* small_tip = g_strndup(large_tip, strchr(large_tip, '\n') - large_tip); */
- /* large_tip = strchr(large_tip, '\n') + 1; */
- /* } */
+ /* const gchar *large_tip = lsq_custom_action_get_blurb(action); */
+ /* gchar *small_tip = NULL; */
+ /* if(strchr(large_tip, '\n')) */
+ /* { */
+ /* small_tip = g_strndup(large_tip, strchr(large_tip, '\n') - large_tip); */
+ /* large_tip = strchr(large_tip, '\n') + 1; */
+ /* } */
- /* gtk_tooltips_set_tip(factory->tips, GTK_WIDGET(widget), small_tip?small_tip:large_tip, large_tip); */
+ /* gtk_tooltips_set_tip(factory->tips, GTK_WIDGET(widget), small_tip?small_tip:large_tip, large_tip); */
- /* g_free(small_tip); */
+ /* g_free(small_tip); */
- /* gtk_widget_show(GTK_WIDGET(widget)); */
+ /* gtk_widget_show(GTK_WIDGET(widget)); */
- /* return widget; */
-/* } */
+ /* return widget; */
+/* } */
-/* GSList* */
+/* GSList* */
/* sq_widget_factory_create_action_menu(SQWidgetFactory *factory, LSQArchiveSupport *support, LSQArchive *archive) */
-/* { */
- /* GSList *menu = NULL; */
- /* GtkWidget *item; */
- /* guint n_act, i; */
- /* LSQCustomAction **action = lsq_archive_support_list_actions(support, &n_act); */
+/* { */
+ /* GSList *menu = NULL; */
+ /* GtkWidget *item; */
+ /* guint n_act, i; */
+ /* LSQCustomAction **action = lsq_archive_support_list_actions(support, &n_act); */
- /* for(i = 0; i < n_act; ++i) */
- /* { */
- /* if(strncmp("menu", lsq_custom_action_get_name(action[i]), 4) == 0) */
- /* { */
- /* item = gtk_menu_item_new_with_label(lsq_custom_action_get_nick(action[i])); */
- /* g_object_set_data(G_OBJECT(item), SQ_ACTION_CUSTOM_DATA, action[i]); */
- /* g_object_set_data(G_OBJECT(item), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
+ /* for(i = 0; i < n_act; ++i) */
+ /* { */
+ /* if(strncmp("menu", lsq_custom_action_get_name(action[i]), 4) == 0) */
+ /* { */
+ /* item = gtk_menu_item_new_with_label(lsq_custom_action_get_nick(action[i])); */
+ /* g_object_set_data(G_OBJECT(item), SQ_ACTION_CUSTOM_DATA, action[i]); */
+ /* g_object_set_data(G_OBJECT(item), SQ_ACTION_CALLBACK_DATA, factory->custom_callback); */
/* g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(cb_sq_widget_factory_action_triggered), archive); */
- /* menu = g_slist_append(menu, item); */
- /* gtk_widget_show(item); */
- /* } */
- /* } */
+ /* menu = g_slist_append(menu, item); */
+ /* gtk_widget_show(item); */
+ /* } */
+ /* } */
- /* g_free(action); */
+ /* g_free(action); */
- /* return menu; */
-/* } */
+ /* return menu; */
+/* } */
-/* static void */
-/* cb_sq_widget_factory_action_triggered(GtkWidget *widget, gpointer user_data) */
-/* { */
- /* LSQArchive *archive = LSQ_ARCHIVE(user_data); */
+/* static void */
+/* cb_sq_widget_factory_action_triggered(GtkWidget *widget, gpointer user_data) */
+/* { */
+ /* LSQArchive *archive = LSQ_ARCHIVE(user_data); */
/* lsq_custom_action_execute(g_object_get_data(G_OBJECT(widget), SQ_ACTION_CUSTOM_DATA), archive, g_object_get_data(G_OBJECT(widget), SQ_ACTION_CALLBACK_DATA)); */
-/* } */
+/* } */
static void
cb_sq_widget_factory_widget_destroyed(GtkObject *obj, gpointer user_data)
@@ -1069,10 +1069,10 @@
}
}
-/* static void */
-/* sq_widget_factory_notify(LSQCustomAction *action, const gchar *message) */
-/* { */
+/* static void */
+/* sq_widget_factory_notify(LSQCustomAction *action, const gchar *message) */
+/* { */
/* GtkWidget *dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s: %s", action->support->id, message); */
- /* gtk_dialog_run(GTK_DIALOG(dialog)); */
- /* gtk_widget_destroy(dialog); */
-/* } */
+ /* gtk_dialog_run(GTK_DIALOG(dialog)); */
+ /* gtk_widget_destroy(dialog); */
+/* } */
Modified: squeeze/trunk/src/widget_factory.h
===================================================================
--- squeeze/trunk/src/widget_factory.h 2007-11-05 18:17:08 UTC (rev 26260)
+++ squeeze/trunk/src/widget_factory.h 2007-11-05 19:46:36 UTC (rev 26261)
@@ -18,22 +18,22 @@
G_BEGIN_DECLS
-#define SQ_WIDGET_FACTORY(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- sq_widget_factory_get_type(), \
+#define SQ_WIDGET_FACTORY(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ sq_widget_factory_get_type(), \
LSQArchive))
-#define LSQ_IS_WIDGET_FACTORY(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_WIDGET_FACTORY(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
sq_widget_factory_get_type()))
#define SQ_WIDGET_FACTORY_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- sq_widget_factory_get_type(), \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ sq_widget_factory_get_type(), \
LSQArchiveClass))
#define LSQ_IS_WIDGET_FACTORY_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ G_TYPE_CHECK_CLASS_TYPE ((klass), \
sq_widget_factory_get_type()))
typedef struct
@@ -48,15 +48,15 @@
GObjectClass parent;
} SQWidgetFactoryClass;
-GType sq_widget_factory_get_type(void);
-SQWidgetFactory *sq_widget_factory_new();
+GType sq_widget_factory_get_type(void);
+SQWidgetFactory *sq_widget_factory_new();
-GtkWidget *sq_widget_factory_create_property_widget(SQWidgetFactory *, GObject *, const gchar *);
-GSList *sq_widget_factory_create_property_menu(SQWidgetFactory *, GObject *, const gchar *);
-// GtkWidget *sq_widget_factory_create_action_widget(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
-// GtkWidget *sq_widget_factory_create_action_menu_item(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
-// GtkToolItem *sq_widget_factory_create_action_bar(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
-// GSList *sq_widget_factory_create_action_menu(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *);
+GtkWidget *sq_widget_factory_create_property_widget(SQWidgetFactory *, GObject *, const gchar *);
+GSList *sq_widget_factory_create_property_menu(SQWidgetFactory *, GObject *, const gchar *);
+// GtkWidget *sq_widget_factory_create_action_widget(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
+// GtkWidget *sq_widget_factory_create_action_menu_item(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
+// GtkToolItem *sq_widget_factory_create_action_bar(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *, const gchar *);
+// GSList *sq_widget_factory_create_action_menu(SQWidgetFactory *, LSQArchiveSupport *, LSQArchive *);
#endif /*__SQ_WIDGET_FACTORY_H__*/
More information about the Xfce4-commits
mailing list