index : freebsd-ports-gnome
FreeBSD GNOME current development ports (https://github.com/freebsd/freebsd-ports-gnome)
54 files changed, 789 insertions, 789 deletions
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 039121a1fa..b41bbe1cde 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -58,12 +58,12 @@ e_bconf_hex_decode (const char *val) { const unsigned char *p = (const unsigned char *) val; char *o, *res; - + o = res = g_malloc (strlen (val) / 2 + 1); for (p = (const unsigned char *)val; (p[0] && p[1]); p += 2) *o++ = (hexnib[p[0]] << 4) | hexnib[p[1]]; *o = 0; - + return res; } @@ -72,7 +72,7 @@ e_bconf_url_decode (const char *val) { const unsigned char *p = (const unsigned char *) val; char *o, *res, c; - + o = res = g_malloc (strlen (val) + 1); while (*p) { c = *p++; @@ -84,7 +84,7 @@ e_bconf_url_decode (const char *val) *o++ = c; } *o = 0; - + return res; } @@ -95,13 +95,13 @@ e_bconf_get_path (xmlDocPtr doc, const char *path) xmlNodePtr root; char *val; int found; - + root = doc->children; if (strcmp ((char *)root->name, "bonobo-config") != 0) { g_warning ("not bonobo-config xml file"); return NULL; } - + root = root->children; while (root) { if (!strcmp ((char *)root->name, "section")) { @@ -113,7 +113,7 @@ e_bconf_get_path (xmlDocPtr doc, const char *path) } root = root->next; } - + return root; } @@ -123,7 +123,7 @@ e_bconf_get_entry (xmlNodePtr root, const char *name) xmlNodePtr node = root->children; int found; char *val; - + while (node) { if (!strcmp ((char *)node->name, "entry")) { val = (char *)xmlGetProp (node, (const unsigned char *)"name"); @@ -134,7 +134,7 @@ e_bconf_get_entry (xmlNodePtr root, const char *name) } node = node->next; } - + return node; } @@ -143,12 +143,12 @@ e_bconf_get_value (xmlNodePtr root, const char *name) { xmlNodePtr node = e_bconf_get_entry (root, name); char *prop, *val = NULL; - + if (node && (prop = (char *)xmlGetProp (node, (const unsigned char *)"value"))) { val = g_strdup (prop); xmlFree (prop); } - + return val; } @@ -156,13 +156,13 @@ char * e_bconf_get_bool (xmlNodePtr root, const char *name) { char *val, *res; - + if ((val = e_bconf_get_value (root, name))) { res = g_strdup (val[0] == '1' ? "true" : "false"); g_free (val); } else res = NULL; - + return res; } @@ -170,13 +170,13 @@ char * e_bconf_get_long (xmlNodePtr root, const char *name) { char *val, *res; - + if ((val = e_bconf_get_value (root, name))) { res = g_strdup (val); g_free (val); } else res = NULL; - + return res; } @@ -184,13 +184,13 @@ char * e_bconf_get_string (xmlNodePtr root, const char *name) { char *val, *res; - + if ((val = e_bconf_get_value (root, name))) { res = e_bconf_hex_decode (val); g_free (val); } else res = NULL; - + return res; } @@ -221,17 +221,17 @@ bconf_lookup_enum (xmlNodePtr root, const char *name, e_bconf_map_t *map) { int index = 0, i; char *val; - + if ((val = e_bconf_get_value (root, name))) { index = atoi (val); g_free (val); } - + for (i = 0; map->child[i].from; i++) { if (i == index) return g_strdup (map->child[i].from); } - + return NULL; } @@ -245,7 +245,7 @@ get_name (const char *in, int index) { GString *out = g_string_new (""); char c, *res; - + while ((c = *in++)) { if (c == '%') { c = *in++; @@ -261,10 +261,10 @@ get_name (const char *in, int index) g_string_append_c (out, c); } } - + res = out->str; g_string_free (out, FALSE); - + return res; } @@ -273,7 +273,7 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source) { char *name, *value; xmlNodePtr node; - + while (map->type != E_BCONF_MAP_END) { if ((map->type & E_BCONF_MAP_MASK) == E_BCONF_MAP_CHILD) { node = xmlNewChild (root, NULL, (unsigned char *)map->to, NULL); @@ -281,16 +281,16 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source) } else { name = get_name (map->from, index); value = lookup_table[(map->type & E_BCONF_MAP_MASK) - 1] (source, name, map); - + d(printf ("key '%s=%s' -> ", name, value)); - + if (map->type & E_BCONF_MAP_CONTENT) { if (value && value[0]) xmlNewTextChild (root, NULL, (unsigned char *)map->to, (unsigned char *)value); } else { xmlSetProp (root, (unsigned char *)map->to, (unsigned char *)value); } - + g_free (value); g_free (name); } @@ -308,7 +308,7 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map int count = 0, i; GSList *list, *l; char *val; - + source = e_bconf_get_path (config_xmldb, bconf_path); if (source) { list = NULL; @@ -316,37 +316,37 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map count = atoi (val); g_free (val); } - + d(printf("Found %d blobs at %s\n", count, bconf_path)); - + for (i = 0; i < count; i++) { xmlDocPtr doc; xmlNodePtr root; xmlChar *xmlbuf; int n; - + doc = xmlNewDoc ((const unsigned char *)"1.0"); root = xmlNewDocNode (doc, NULL, (unsigned char *)name, NULL); xmlDocSetRootElement (doc, root); - + /* This could be set with a MAP_UID type ... */ if (idparam) { char buf[16]; - + sprintf (buf, "%d", i); xmlSetProp (root, (unsigned char *)idparam, (unsigned char *)buf); } - + build_xml (root, map, i, source); - + xmlDocDumpMemory (doc, &xmlbuf, &n); xmlFreeDoc (doc); - + list = g_slist_append (list, xmlbuf); } - + gconf_client_set_list (gconf, gconf_path, GCONF_VALUE_STRING, list, NULL); - + while (list) { l = list->next; xmlFree (list->data); @@ -356,7 +356,7 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map } else { g_warning ("could not find '%s' in old config database, skipping", bconf_path); } - + return 0; } @@ -372,13 +372,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * GSList *list, *l; char buf[32]; int i, j, k; - + /* process all flat config */ for (i = 0; remap_list[i].root; i++) { d(printf ("Path: %s\n", remap_list[i].root)); if (!(source = e_bconf_get_path (config_xmldb, remap_list[i].root))) continue; - + map = remap_list[i].map; for (j = 0; map[j].from; j++) { if (map[j].type & E_GCONF_MAP_LIST) { @@ -401,12 +401,12 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * list = g_slist_append (list, e_bconf_hex_decode (val)); break; } - + g_free (val); k++; } } while (val); - + if (list) { path = g_strdup_printf ("/apps/evolution/%s", map[j].to); gconf_client_set_list (gconf, path, gconf_type[map[j].type & E_GCONF_MAP_MASK], list, NULL); @@ -415,7 +415,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * g_slist_foreach (list, (GFunc) g_free, NULL); g_slist_free (list); } - + continue; } else if (map[j].type == E_GCONF_MAP_ANYLIST) { val = NULL; @@ -423,13 +423,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * if (!(val = e_bconf_get_value (source, map[j].from))) continue; } - + d(printf (" %s = '%s' -> %s [%d]\n", map[j].from, val == NULL ? "(null)" : val, map[j].to, map[j].type)); - + path = g_strdup_printf ("/apps/evolution/%s", map[j].to); switch (map[j].type) { case E_GCONF_MAP_BOOL: @@ -455,13 +455,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * case E_GCONF_MAP_STRLIST: { char *v = e_bconf_hex_decode (val); char **t = g_strsplit (v, " !<-->!", 8196); - + list = NULL; for (k = 0; t[k]; k++) { list = g_slist_append (list, t[k]); d(printf (" [%d] = '%s'\n", k, t[k])); } - + gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL); g_slist_free (list); g_strfreev (t); @@ -470,12 +470,12 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * case E_GCONF_MAP_ANYLIST: { xmlNodePtr node = source->children; list = NULL; - + /* find the entry node */ while (node) { if (!strcmp ((char *)node->name, "entry")) { int found; - + if ((tmp = (char *)xmlGetProp (node, (const unsigned char *)"name"))) { found = strcmp ((char *)tmp, map[j].from) == 0; xmlFree (tmp); @@ -483,10 +483,10 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * break; } } - + node = node->next; } - + /* find the the any block */ if (node) { node = node->children; @@ -496,7 +496,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * node = node->next; } } - + /* skip to the value inside it */ if (node) { node = node->children; @@ -506,7 +506,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * node = node->next; } } - + if (node) { node = node->children; while (node) { @@ -515,7 +515,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * node = node->next; } } - + /* & store */ if (list) { gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL); @@ -526,19 +526,19 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * list = l; } } - + break; } case E_GCONF_MAP_COLOUR: sprintf (buf, "#%06x", atoi (val) & 0xffffff); gconf_client_set_string (gconf, path, buf, NULL); break; } - + /* FIXME: handle errors */ g_free (path); g_free (val); } } - + return 0; } diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index a4af5e76b5..572f0d4009 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -153,7 +153,7 @@ eba_dispose (GObject *object) (* G_OBJECT_CLASS (e_bit_array_parent_class)->dispose) (object); } -/** +/** * e_selection_model_is_row_selected * @selection: #EBitArray to check * @n: The row to check @@ -172,7 +172,7 @@ e_bit_array_value_at (EBitArray *eba, return (eba->data[BOX(n)] >> OFFSET(n)) & 0x1; } -/** +/** * e_selection_model_foreach * @selection: #EBitArray to traverse * @callback: The callback function to call back. @@ -181,7 +181,7 @@ e_bit_array_value_at (EBitArray *eba, * This routine calls the given callback function once for each * selected row, passing closure as the closure. */ -void +void e_bit_array_foreach (EBitArray *eba, EForeachFunc callback, gpointer closure) @@ -202,7 +202,7 @@ e_bit_array_foreach (EBitArray *eba, } } -/** +/** * e_selection_model_clear * @selection: #EBitArray to clear * @@ -219,7 +219,7 @@ e_bit_array_clear(EBitArray *eba) #define PART(x,n) (((x) & (0x01010101 << n)) >> n) #define SECTION(x, n) (((x) >> (n * 8)) & 0xff) -/** +/** * e_selection_model_selected_count * @selection: #EBitArray to count * @@ -253,7 +253,7 @@ e_bit_array_selected_count (EBitArray *eba) return count; } -/** +/** * e_selection_model_select_all * @selection: #EBitArray to select all * @@ -264,10 +264,10 @@ void e_bit_array_select_all (EBitArray *eba) { int i; - + if (!eba->data) eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32); - + for (i = 0; i < (eba->bit_count + 31) / 32; i ++) { eba->data[i] = ONES; } @@ -285,7 +285,7 @@ e_bit_array_select_all (EBitArray *eba) } } -/** +/** * e_selection_model_invert_selection * @selection: #EBitArray to invert * @@ -299,7 +299,7 @@ e_bit_array_invert_selection (EBitArray *eba) if (!eba->data) eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32); - + for (i = 0; i < (eba->bit_count + 31) / 32; i ++) { eba->data[i] = ~eba->data[i]; } diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 0c7ba61199..b15e50a581 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-bit-array.h * Copyright 2000, 2001, Ximian, Inc. * diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 16a7671155..9907f557e3 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -78,22 +78,22 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry) GtkDialog *dialog; const char *text; int result; - + g_return_if_fail (entry != NULL); g_return_if_fail (GTK_IS_ENTRY (entry)); - + text = gtk_entry_get_text (GTK_ENTRY (entry)); dialog = GTK_DIALOG (e_categories_dialog_new (text)); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (entry)))); - + /* run the dialog */ result = gtk_dialog_run (dialog); - + if (result == GTK_RESPONSE_OK) { text = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog)); gtk_entry_set_text (GTK_ENTRY (entry), text); } - + gtk_object_destroy (GTK_OBJECT (dialog)); } diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 44ed9c0447..b40b8e170a 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -572,7 +572,7 @@ e_config_listener_remove_dir (EConfigListener *cl, const char *dir) slist = gconf_client_all_entries (cl->priv->db, dir, NULL); for (iter = slist; iter != NULL; iter = iter->next) { GConfEntry *entry = iter->data; - + key = gconf_entry_get_key (entry); gconf_client_unset (cl->priv->db, key, NULL); gconf_entry_free (entry); diff --git a/e-util/e-config.c b/e-util/e-config.c index 484630cd1d..79e87c84b6 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -47,7 +47,7 @@ #include <glib/gi18n.h> -#define d(x) +#define d(x) struct _EConfigFactory { struct _EConfigFactory *next, *prev; @@ -179,10 +179,10 @@ ep_base_init(GObjectClass *klass) /** * e_config_get_type: - * + * * Standard GObject method. Used to subclass for the concrete * implementations. - * + * * Return value: EConfig type. **/ GType @@ -211,9 +211,9 @@ e_config_get_type(void) * @type: The type of configuration manager, @E_CONFIG_BOOK or * @E_CONFIG_DRUID. * @id: The name of the configuration window this manager drives. - * + * * Used by implementing classes to initialise base parameters. - * + * * Return value: @ep is returned. **/ EConfig *e_config_construct(EConfig *ep, int type, const char *id) @@ -238,7 +238,7 @@ EConfig *e_config_construct(EConfig *ep, int type, const char *id) * @freefunc: If supplied, called to free the item list (and/or items) * once they are no longer needed. * @data: Data for the callback methods. - * + * * Add new EConfigItems to the configuration window. Nothing will be * done with them until the widget is built. * @@ -264,7 +264,7 @@ e_config_add_items(EConfig *ec, GSList *items, EConfigItemsFunc commitfunc, ECon * @pageid: pageid to check. * @check: checking callback. * @data: user-data for the callback. - * + * * Add a page-checking function callback. It will be called to validate the * data in the given page or pages. If @pageid is NULL then it will be called * to validate every page, or the whole configuration window. @@ -678,7 +678,7 @@ ec_rebuild(EConfig *emp) } frame = g_object_new(gtk_frame_get_type(), - "shadow_type", GTK_SHADOW_NONE, + "shadow_type", GTK_SHADOW_NONE, "label_widget", label, "child", g_object_new(gtk_alignment_get_type(), "left_padding", 12, @@ -772,7 +772,7 @@ ec_rebuild(EConfig *emp) * e_config_set_target: * @emp: An initialised EConfig. * @target: A target allocated from @emp. - * + * * Sets the target object for the config window. Generally the target * is set only once, and will supply its own "changed" signal which * can be used to drive the modal. This is a virtual method so that @@ -800,12 +800,12 @@ ec_widget_destroy(GtkWidget *w, EConfig *ec) /** * e_config_create_widget: * @emp: An initialised EConfig object. - * + * * Create the widget described by @emp. Only the core widget * appropriate for the given type is created, i.e. a GtkNotebook for * the E_CONFIG_BOOK type and a GnomeDruid for the E_CONFIG_DRUID * type. - * + * * This object will be self-driving, but will not close itself once * complete. * @@ -877,7 +877,7 @@ ec_dialog_response(GtkWidget *d, int id, EConfig *ec) * @emp: Initialised and configured EMConfig derived instance. * @parent: Parent window or NULL. * @title: Title of window or dialog. - * + * * Create a managed GtkWindow object from @emp. This window will be * fully driven by the EConfig @emp. If @emp.type is * @E_CONFIG_DRUID, then this will be a toplevel GtkWindow containing @@ -886,7 +886,7 @@ ec_dialog_response(GtkWidget *d, int id, EConfig *ec) * * Unless reffed otherwise, the management object @emp will be * finalised when the widget is. - * + * * Return value: The window widget. This is also stored in @emp.window. **/ GtkWidget * @@ -949,9 +949,9 @@ ec_idle_handler_for_rebuild (gpointer data) /** * e_config_target_changed: - * @emp: - * @how: - * + * @emp: + * @how: + * * Indicate that the target has changed. This may be called by the * self-aware target itself, or by the driving code. If @how is * %E_CONFIG_TARGET_CHANGED_REBUILD, then the entire configuration @@ -987,8 +987,8 @@ void e_config_target_changed(EConfig *emp, e_config_target_change_t how) /** * e_config_abort: - * @ec: - * + * @ec: + * * Signify that the stateful configuration changes must be discarded * to all listeners. This is used by self-driven druid or notebook, or * may be used by code using the widget directly. @@ -1007,8 +1007,8 @@ void e_config_abort(EConfig *ec) /** * e_config_commit: - * @ec: - * + * @ec: + * * Signify that the stateful configuration changes should be saved. * This is used by the self-driven druid or notebook, or may be used * by code driving the widget directly. @@ -1027,12 +1027,12 @@ void e_config_commit(EConfig *ec) /** * e_config_page_check: - * @ec: + * @ec: * @pageid: The path of the page item. - * + * * Check that a given page is complete. If @pageid is NULL, then check * the whole config. No check is made that the page actually exists. - * + * * Return value: FALSE if the data is inconsistent/incomplete. **/ gboolean e_config_page_check(EConfig *ec, const char *pageid) @@ -1052,11 +1052,11 @@ gboolean e_config_page_check(EConfig *ec, const char *pageid) /** * e_config_page_get: - * @ec: + * @ec: * @pageid: The path of the page item. - * + * * Retrieve the page widget corresponding to @pageid. - * + * * Return value: The page widget. It will be the root GtkNotebook * container or the GnomeDruidPage object. **/ @@ -1077,12 +1077,12 @@ GtkWidget *e_config_page_get(EConfig *ec, const char *pageid) /** * e_config_page_next: - * @ec: + * @ec: * @pageid: The path of the page item. - * + * * Find the path of the next visible page after @pageid. If @pageid * is NULL then find the first visible page. - * + * * Return value: The path of the next page, or @NULL if @pageid was the * last configured and visible page. **/ @@ -1108,12 +1108,12 @@ const char *e_config_page_next(EConfig *ec, const char *pageid) /** * e_config_page_next: - * @ec: + * @ec: * @pageid: The path of the page item. - * + * * Find the path of the previous visible page before @pageid. If @pageid * is NULL then find the last visible page. - * + * * Return value: The path of the previous page, or @NULL if @pageid was the * first configured and visible page. **/ @@ -1147,12 +1147,12 @@ const char *e_config_page_prev(EConfig *ec, const char *pageid) * @func: An EConfigFactoryFunc to call when the window @id is being * created. * @data: Callback data. - * + * * Add a config factory which will be called to add_items() any * extra items's if wants to, to the current Config window. * * TODO: Make the id a pattern? - * + * * Return value: A handle to the factory. **/ EConfigFactory * @@ -1171,7 +1171,7 @@ e_config_class_add_factory(EConfigClass *klass, const char *id, EConfigFactoryFu /** * e_config_class_remove_factory: * @f: Handle from :class_add_factory() call. - * + * * Remove a config factory. The handle @f may only be removed once. **/ void @@ -1187,7 +1187,7 @@ e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f) * @ep: Parent EConfig object. * @type: type, up to implementor * @size: Size of object to allocate. - * + * * Allocate a new config target suitable for this class. Implementing * classes will define the actual content of the target. **/ @@ -1212,7 +1212,7 @@ void *e_config_target_new(EConfig *ep, int type, size_t size) * e_config_target_free: * @ep: Parent EConfig object. * @o: The target to fre. - * + * * Free a target. The implementing class can override this method to * free custom targets. **/ @@ -1291,10 +1291,10 @@ ech_check(EConfig *ec, const char *pageid, void *data) { struct _EConfigHookGroup *group = data; EConfigHookPageCheckData hdata; - + if (!group->hook->hook.plugin->enabled) return TRUE; - + hdata.config = ec; hdata.target = ec->target; hdata.pageid = pageid?pageid:""; @@ -1496,16 +1496,16 @@ emph_class_init(EPluginHookClass *klass) /** * e_config_hook_get_type: - * + * * Standard GObject function to get the object type. - * + * * Return value: The EConfigHook class type. **/ GType e_config_hook_get_type(void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof(EConfigHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL, @@ -1515,7 +1515,7 @@ e_config_hook_get_type(void) emph_parent_class = g_type_class_ref(e_plugin_hook_get_type()); type = g_type_register_static(e_plugin_hook_get_type(), "EConfigHook", &info, 0); } - + return type; } @@ -1525,7 +1525,7 @@ e_config_hook_get_type(void) * @klass: The dervied EconfigHook class. * @map: A map used to describe a single EConfigTarget type for this * class. - * + * * Add a targe tmap to a concrete derived class of EConfig. The * target map enumates the target types available for the implenting * class. diff --git a/e-util/e-config.h b/e-util/e-config.h index c7f37a8e10..ffd4896c9d 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -62,11 +62,11 @@ typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem * /** * enum _e_config_target_changed_t - Target changed mode. - * + * * @E_CONFIG_TARGET_CHANGED_STATE: A state of the target has changed. * @E_CONFIG_TARGET_CHANGED_REBUILD: A state of the target has * changed, and the UI must be reconfigured as a result. - * + * * How the target has changed. If @E_CONFIG_TARGET_CHANGED_REBUILD then a * widget reconfigure is necessary, otherwise it is used to check if * the widget is complete yet. @@ -79,7 +79,7 @@ enum _e_config_target_change_t { /** * enum _e_config_t - configuration item type. - * + * * @E_CONFIG_BOOK: A notebook item. Only one of this or * @E_CONFIG_DRUID may be included in the item list for the entire * configuration description. @@ -105,7 +105,7 @@ enum _e_config_target_change_t { * section defined in the configuration system. * @E_CONFIG_ITEM_TABLE: A configuration item with a parent * @E_CONFIG_SECTION_TABLE. - * + * * A configuration item type for each configuration item added to the * EConfig object. These are merged from all contributors to the * configuration window, and then processed to form the combined @@ -127,7 +127,7 @@ enum _e_config_t { /** * struct _EConfigItem - A configuration item. - * + * * @type: The configuration item type. * @path: An absolute path positioning this item in the configuration * window. This will be used as a sort key for an ASCII sort to @@ -151,11 +151,11 @@ struct _EConfigItem { /** * struct _EConfigTarget - configuration context. - * + * * @config: The parent object. * @widget: A target-specific parent widget. * @type: The type of target, defined by implementing classes. - * + * * The base target object is used as the parent and placeholder for * configuration context for a given configuration window. It is * subclassed by implementing classes to provide domain-specific @@ -172,7 +172,7 @@ struct _EConfigTarget { /** * struct _EConfig - A configuration management object. - * + * * @object: Superclass. * @priv: Private data. * @type: Either @E_CONFIG_BOOK or @E_CONFIG_DRIUD, describing the @@ -186,7 +186,7 @@ struct _EConfigTarget { * @window: If :create_window() is called, then the containing * toplevel GtkDialog or GtkWindow appropriate for the @type of * configuration window created. - * + * **/ struct _EConfig { GObject object; @@ -205,7 +205,7 @@ struct _EConfig { /** * struct _EConfigClass - Configuration management abstract class. - * + * * @object_class: Superclass. * @factories: A list of factories registered on this type of * configuration manager. @@ -214,7 +214,7 @@ struct _EConfig { * into changes on the target to propery drive the manager. * @target_free: A virtual method used to free the target in an * implementation-defined way. - * + * **/ struct _EConfigClass { GObjectClass object_class; @@ -279,7 +279,7 @@ typedef void (*EConfigHookItemFactoryFunc)(struct _EPlugin *plugin, EConfigHookI /** * struct _EConfigHookItemFactoryData - Factory marshalling structure. - * + * * @config: The parent EConfig. This is also available in * @target->config but is here as a convenience. (TODO: do we need this). * @item: The corresponding configuration item. @@ -303,12 +303,12 @@ struct _EConfigHookItemFactoryData { /** * struct _EConfigHookPageCheckData - Check callback data. - * - * @config: + * + * @config: * @target: The current configuration target. This is also available * on @config->target. * @pageid: Name of page to validate, or "" means check all configuration. - * + * **/ struct _EConfigHookPageCheckData { EConfig *config; @@ -318,7 +318,7 @@ struct _EConfigHookPageCheckData { /** * struct _EConfigHookGroup - A group of configuration items. - * + * * @hook: Parent object. * @id: The configuration window to which these items apply. * @target_type: The target type expected by the items. This is @@ -345,11 +345,11 @@ struct _EConfigHookGroup { /** * struct _EConfigHook - Plugin hook for configuration windows. - * + * * @hook: Superclass. * @groups: A list of EConfigHookGroup's of all configuration windows * this plugin hooks into. - * + * **/ struct _EConfigHook { EPluginHook hook; @@ -360,7 +360,7 @@ struct _EConfigHook { /** * struct _EConfigHookClass - Abstract class for configuration window * plugin hooks. - * + * * @hook_class: Superclass. * @target_map: A table of EConfigHookTargetMap structures describing * the possible target types supported by this class. @@ -369,7 +369,7 @@ struct _EConfigHook { * * This is an abstract class defining the plugin hook point for * configuration windows. - * + * **/ struct _EConfigHookClass { EPluginHookClass hook_class; diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c index 9fa5dc1d15..b688de6294 100644 --- a/e-util/e-corba-utils.c +++ b/e-util/e-corba-utils.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* e-html-utils.c -* +* * Copyright (C) 2000 Ximian, Inc. * Author: Ettore Perazzoli <ettore@ximian.com> * diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h index b93c70d41f..91fb305d52 100644 --- a/e-util/e-corba-utils.h +++ b/e-util/e-corba-utils.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* e-corba-utils.h - * + * * Copyright (C) 2000 Ximian, Inc. * Author: Ettore Perazzoli <ettore@ximian.com> * diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c index 22d265ce7b..fa7fa991f9 100644 --- a/e-util/e-cursor.c +++ b/e-util/e-cursor.c @@ -32,13 +32,13 @@ * e_cursor_set: * @widget: Any widget in a window, to which busy cursor has to be set * cursor: The type of cursor to be set defined in e-cursor.h - * + * * Sets the cursor specified, to the top level window of the given widget. - * It is not window aware, so if you popup a window, it will not have + * It is not window aware, so if you popup a window, it will not have * busy cursor set. That has to be handled seperately with a new call to this * function. * - * Return value: + * Return value: **/ void e_cursor_set (GtkWidget *widget, ECursorType cursor) { diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 6aa5da34be..1c75dc83e5 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -82,7 +82,7 @@ e_notice (gpointer parent, GtkMessageType type, const char *format, ...) str); va_end (args); g_free (str); - + if (parent) e_dialog_set_transient_for (GTK_WINDOW (dialog), parent); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -117,7 +117,7 @@ e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const char *form gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); va_end (args); g_free (str); - + if (parent) e_dialog_set_transient_for_xid (GTK_WINDOW (dialog), parent); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -158,7 +158,7 @@ window_is_wm_toplevel (Display *display, Window window) * e_dialog_set_transient_for: * @dialog: a dialog window * @parent_widget: the parent for @dialog - * + * * This sets the parent for @dialog to be @parent_widget. Unlike * gtk_window_set_transient_for(), this doesn't need @parent_widget to * be the actual toplevel, and also works if @parent_widget is @@ -218,7 +218,7 @@ dialog_realized (GtkWindow *dialog, gpointer xid) * e_dialog_set_transient_for_xid: * @dialog: a dialog window * @xid: the X Window parent - * + * * Like e_dialog_set_transient_for(), but use an XID to specify the * parent window. **/ @@ -263,7 +263,7 @@ save_ok (GtkWidget *widget, gpointer data) GtkWidget *fs; char **filename = data; char *uri; - + fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fs)); @@ -271,7 +271,7 @@ save_ok (GtkWidget *widget, gpointer data) e_file_update_save_path(gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER(fs)), TRUE); *filename = uri; } - + gtk_main_quit (); } @@ -293,13 +293,13 @@ e_file_dialog_save (const char *title, const char *fname) selection = e_file_get_save_filesel(NULL, title, fname, GTK_FILE_CHOOSER_ACTION_SAVE); g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (filechooser_response), &filename); - + gtk_widget_show (GTK_WIDGET (selection)); gtk_grab_add (GTK_WIDGET (selection)); gtk_main (); - + gtk_widget_destroy (GTK_WIDGET (selection)); - + return filename; } @@ -309,13 +309,13 @@ save_folder_ok (GtkWidget *widget, gpointer data) GtkWidget *fs; char **filename = data; char *uri; - + fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fs)); - + e_file_update_save_path(uri, FALSE); *filename = uri; - + gtk_main_quit (); } @@ -336,13 +336,13 @@ e_file_dialog_save_folder (const char *title) selection = e_file_get_save_filesel(NULL, title, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (folderchooser_response), &filename); - + gtk_widget_show (GTK_WIDGET (selection)); gtk_grab_add (GTK_WIDGET (selection)); gtk_main (); - + gtk_widget_destroy (GTK_WIDGET (selection)); - + return filename; } diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index 36ade95803..20f7db5ce5 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -58,7 +58,7 @@ dialog_destroy_cb (DialogHooks *hooks, GObject *dialog) { g_slist_free (hooks->whooks); hooks->whooks = NULL; - + g_free (hooks); g_object_set_data (dialog, "dialog-hooks", NULL); } @@ -70,14 +70,14 @@ static DialogHooks * get_dialog_hooks (GtkWidget *dialog) { DialogHooks *hooks; - + hooks = g_object_get_data ((GObject *) dialog, "dialog-hooks"); if (!hooks) { hooks = g_new0 (DialogHooks, 1); g_object_set_data ((GObject *) dialog, "dialog-hooks", hooks); g_object_weak_ref ((GObject *) dialog, (GWeakNotify) dialog_destroy_cb, hooks); } - + return hooks; } @@ -88,11 +88,11 @@ static int value_to_index (const int *value_map, int value) { int i; - + for (i = 0; value_map[i] != -1; i++) if (value_map[i] == value) return i; - + return -1; } @@ -103,15 +103,15 @@ static int index_to_value (const int *value_map, int index) { int i; - + /* We do this the hard way, i.e. not as a simple array reference, to * check for correctness. */ - + for (i = 0; value_map[i] != -1; i++) if (i == index) return value_map[i]; - + return -1; } @@ -121,12 +121,12 @@ hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpoint { const int *value_map; int *value; - + /* Set the value */ - + value = (int *) value_var; value_map = (const int *) info; - + e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map); } @@ -136,10 +136,10 @@ get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info) { int *value; const int *value_map; - + value = (int *) value_var; value_map = (const int *) info; - + *value = e_dialog_radio_get (GTK_WIDGET (radio), value_map); } @@ -149,12 +149,12 @@ hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, g { const int *value_map; int *value; - + /* Set the value */ - + value = (int *) value_var; value_map = (const int *) info; - + e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map); } @@ -164,10 +164,10 @@ get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info) { const int *value_map; int *value; - + value = (int *) value_var; value_map = (const int *) info; - + *value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map); } @@ -176,9 +176,9 @@ static void hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info) { gboolean *value; - + /* Set the value */ - + value = (gboolean *) value_var; e_dialog_toggle_set (GTK_WIDGET (toggle), *value); } @@ -188,7 +188,7 @@ static void get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info) { gboolean *value; - + value = (gboolean *) value_var; *value = e_dialog_toggle_get (GTK_WIDGET (toggle)); } @@ -199,14 +199,14 @@ hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gp { double *value; GtkAdjustment *adj; - + /* Set the value */ - + value = (double *) value_var; e_dialog_spin_set (GTK_WIDGET (spin), *value); - + /* Hook to changed */ - + adj = gtk_spin_button_get_adjustment (spin); } @@ -215,7 +215,7 @@ static void get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info) { double *value; - + value = (double *) value_var; *value = e_dialog_spin_get_double (GTK_WIDGET (spin)); } @@ -225,11 +225,11 @@ static void hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info) { char **value; - + /* Set the value */ - + value = (char **) value_var; - + e_dialog_editable_set (GTK_WIDGET (editable), *value); } @@ -238,11 +238,11 @@ static void get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data) { char **value; - + value = (char **) value_var; if (*value) g_free (*value); - + *value = e_dialog_editable_get (GTK_WIDGET (editable)); } @@ -250,19 +250,19 @@ get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data) * e_dialog_editable_set: * @widget: A #GtkEditable widget. * @value: String value. - * + * * Sets the string value inside a #GtkEditable-derived widget. **/ void e_dialog_editable_set (GtkWidget *widget, const char *value) { int pos = 0; - + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_EDITABLE (widget)); - + gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1); - + if (value) gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &pos); } @@ -270,9 +270,9 @@ e_dialog_editable_set (GtkWidget *widget, const char *value) /** * e_dialog_editable_get: * @widget: A #GtkEditable widget. - * + * * Queries the string value inside a #GtkEditable-derived widget. - * + * * Return value: String value. You should free it when you are done with it. * This function can return NULL if the string could not be converted from * GTK+'s encoding into UTF8. @@ -282,7 +282,7 @@ e_dialog_editable_get (GtkWidget *widget) { g_return_val_if_fail (widget != NULL, NULL); g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL); - + return gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1); } @@ -291,7 +291,7 @@ e_dialog_editable_get (GtkWidget *widget) * @widget: A #GtkRadioButton in a radio button group. * @value: Enumerated value. * @value_map: Map from enumeration values to array indices. - * + * * Sets the selected item in a radio group. The specified @widget can be any of * the #GtkRadioButtons in the group. Each radio button should correspond to an * enumeration value; the specified @value will be mapped to an integer from @@ -305,24 +305,24 @@ e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map) { GSList *group, *l; int i; - + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_RADIO_BUTTON (widget)); g_return_if_fail (value_map != NULL); - + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)); - + i = value_to_index (value_map, value); if (i != -1) { /* Groups are built by prepending items, so the list ends up in reverse * order; we need to flip the index around. */ i = g_slist_length (group) - i - 1; - + l = g_slist_nth (group, i); if (!l) g_message ("e_dialog_radio_set(): could not find index %d in radio group!", i); - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l->data), TRUE); } else g_message ("e_dialog_radio_set(): could not find value %d in value map!", value); @@ -332,11 +332,11 @@ e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map) * e_dialog_radio_get: * @widget: A #GtkRadioButton in a radio button group. * @value_map: Map from enumeration values to array indices. - * + * * Queries the selected item in a #GtkRadioButton group. Please read the * description of e_dialog_radio_set() to see how @value_map maps enumeration * values to button indices. - * + * * Return value: Enumeration value which corresponds to the selected item in the * radio group. **/ @@ -345,33 +345,33 @@ e_dialog_radio_get (GtkWidget *widget, const int *value_map) { GSList *group, *l; int i, v; - + g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1); g_return_val_if_fail (value_map != NULL, -1); - + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)); - + for (i = 0, l = group; l; l = l->next, i++) { widget = GTK_WIDGET (l->data); - + if (GTK_TOGGLE_BUTTON (widget)->active) break; } - + g_return_val_if_fail (l != NULL, -1); - + /* Groups are built by prepending items, so the list ends up in reverse * order; we need to flip the index around. */ i = g_slist_length (group) - i - 1; - + v = index_to_value (value_map, i); if (v == -1) { g_message ("e_dialog_radio_get(): could not find index %d in value map!", i); return -1; } - + return v; } @@ -379,7 +379,7 @@ e_dialog_radio_get (GtkWidget *widget, const int *value_map) * e_dialog_toggle_set: * @widget: A #GtkToggleButton. * @value: Toggle value. - * + * * Sets the value of a #GtkToggleButton-derived widget. This should not be used * for radio buttons; it is more convenient to use use e_dialog_radio_set() * instead. @@ -389,18 +389,18 @@ e_dialog_toggle_set (GtkWidget *widget, gboolean value) { g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget)); - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value); } /** * e_dialog_toggle_get: * @widget: A #GtkToggleButton. - * + * * Queries the value of a #GtkToggleButton-derived widget. This should not be * used for radio buttons; it is more convenient to use e_dialog_radio_get() * instead. - * + * * Return value: Toggle value. **/ gboolean @@ -408,7 +408,7 @@ e_dialog_toggle_get (GtkWidget *widget) { g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE); - + return GTK_TOGGLE_BUTTON (widget)->active; } @@ -416,19 +416,19 @@ e_dialog_toggle_get (GtkWidget *widget) * e_dialog_spin_set: * @widget: A #GtkSpinButton. * @value: Numeric value. - * + * * Sets the value of a #GtkSpinButton widget. **/ void e_dialog_spin_set (GtkWidget *widget, double value) { GtkAdjustment *adj; - + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_SPIN_BUTTON (widget)); - + adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)); - + adj->value = value; g_signal_emit_by_name (adj, "value_changed", 0); } @@ -436,19 +436,19 @@ e_dialog_spin_set (GtkWidget *widget, double value) /** * e_dialog_spin_get_double: * @widget: A #GtkSpinButton. - * + * * Queries the floating-point value of a #GtkSpinButton widget. - * + * * Return value: Numeric value. **/ double e_dialog_spin_get_double (GtkWidget *widget) { GtkAdjustment *adj; - + g_return_val_if_fail (widget != NULL, 0.0); g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0); - + adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)); return adj->value; } @@ -456,19 +456,19 @@ e_dialog_spin_get_double (GtkWidget *widget) /** * e_dialog_spin_get_int: * @widget: A #GtkSpinButton. - * + * * Queries the integer value of a #GtkSpinButton widget. - * + * * Return value: Numeric value. **/ int e_dialog_spin_get_int (GtkWidget *widget) { double value; - + g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1); - + value = e_dialog_spin_get_double (widget); return (int) floor (value); } @@ -478,7 +478,7 @@ e_dialog_spin_get_int (GtkWidget *widget) * @widget: A #GtkOptionMenu. * @value: Enumerated value. * @value_map: Map from enumeration values to array indices. - * + * * Sets the selected item in a #GtkOptionMenu. Please read the description of * e_dialog_radio_set() to see how @value_map maps enumeration values to item * indices. @@ -487,13 +487,13 @@ void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map) { int i; - + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_OPTION_MENU (widget)); g_return_if_fail (value_map != NULL); - + i = value_to_index (value_map, value); - + if (i != -1) gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i); else @@ -505,11 +505,11 @@ e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map) * e_dialog_option_menu_get: * @widget: A #GtkOptionMenu. * @value_map: Map from enumeration values to array indices. - * + * * Queries the selected item in a #GtkOptionMenu. Please read the description * of e_dialog_radio_set() to see how @value_map maps enumeration values to item * indices. - * + * * Return value: Enumeration value which corresponds to the selected item in the * option menu. **/ @@ -522,31 +522,31 @@ e_dialog_option_menu_get (GtkWidget *widget, const int *value_map) GList *l; int i; int v; - + g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1); g_return_val_if_fail (value_map != NULL, -1); - + menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget))); - + active = gtk_menu_get_active (menu); g_return_val_if_fail (active != NULL, -1); - + children = GTK_MENU_SHELL (menu)->children; - + for (i = 0, l = children; l; l = l->next, i++) { if (GTK_WIDGET (l->data) == active) break; } - + g_return_val_if_fail (l != NULL, -1); - + v = index_to_value (value_map, i); if (v == -1) { g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i); return -1; } - + return v; } @@ -611,7 +611,7 @@ e_dialog_combo_box_get (GtkWidget *widget, const int *value_map) * e_dialog_dateedit_set: * @widget: A #GnomeDateEdit widget. * @t: Date/time value. - * + * * Sets the value of a #GnomeDateEdit widget. **/ void @@ -619,16 +619,16 @@ e_dialog_dateedit_set (GtkWidget *widget, time_t t) { g_return_if_fail (widget != NULL); g_return_if_fail (GNOME_IS_DATE_EDIT (widget)); - + gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t); } /** * e_dialog_dateedit_get: * @widget: A #GnomeDateEdit widget. - * + * * Queries the value of a #GnomeDateEdit widget. - * + * * Return value: Date/time value. **/ time_t @@ -636,7 +636,7 @@ e_dialog_dateedit_get (GtkWidget *widget) { g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1); - + return gnome_date_edit_get_time (GNOME_DATE_EDIT (widget)); } @@ -647,7 +647,7 @@ e_dialog_dateedit_get (GtkWidget *widget) * @value_var: Pointer to the variable that the @widget will control. * @info: NULL for most widgets, or an integer value map array (see * e_dialog_radio_set() for details). - * + * * Hooks a widget from a dialog box to the variable it will modify. Supported * widgets are: #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean), @@ -671,18 +671,18 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, { DialogHooks *hooks; WidgetHook *wh; - + g_return_val_if_fail (dialog != NULL, FALSE); g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (value_var != NULL, FALSE); - + hooks = get_dialog_hooks (dialog); - + /* First check if it is a "group" widget, like a radio button or an * option menu. Then we check for normal ungrouped widgets. */ - + if (GTK_IS_RADIO_BUTTON (widget)) hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info); else if (GTK_IS_OPTION_MENU (widget)) @@ -695,14 +695,14 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, hook_editable (dialog, GTK_EDITABLE (widget), value_var, info); else return FALSE; - + wh = g_new (WidgetHook, 1); wh->widget = widget; wh->value_var = value_var; wh->info = info; - + hooks->whooks = g_slist_prepend (hooks->whooks, wh); - + return TRUE; } @@ -710,7 +710,7 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, * e_dialog_get_values: * @dialog: A dialog box whose widgets have been hooked to the appropriate * variables with e_dialog_widget_hook_value(). - * + * * Makes every widget in a @dialog that was hooked with * e_dialog_widget_hook_value() apply its value to its corresponding variable. * The typical usage is to call this function in the handler for the "OK" button @@ -721,16 +721,16 @@ e_dialog_get_values (GtkWidget *dialog) { DialogHooks *hooks; GSList *l; - + g_return_if_fail (dialog != NULL); - + hooks = get_dialog_hooks (dialog); - + for (l = hooks->whooks; l; l = l->next) { WidgetHook *wh; - + wh = l->data; - + if (GTK_IS_RADIO_BUTTON (wh->widget)) get_radio_value (GTK_RADIO_BUTTON (wh->widget), wh->value_var, wh->info); else if (GTK_IS_OPTION_MENU (wh->widget)) @@ -754,10 +754,10 @@ e_dialog_get_values (GtkWidget *dialog) * @value_var: Pointer to the variable that the widget will control. * @info: NULL for most widgets, or an integer value map array (see * e_dialog_radio_set() for details). - * + * * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML * data structure. - * + * * Return value: TRUE if the type of the specified widget is supported, FALSE * otherwise. **/ @@ -766,19 +766,19 @@ e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *wi gpointer value_var, gpointer info) { GtkWidget *widget; - + g_return_val_if_fail (xml != NULL, FALSE); g_return_val_if_fail (GLADE_IS_XML (xml), FALSE); g_return_val_if_fail (dialog != NULL, FALSE); g_return_val_if_fail (widget_name != NULL, FALSE); g_return_val_if_fail (value_var != NULL, FALSE); - + widget = glade_xml_get_widget (xml, widget_name); if (!widget) { g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in " "Glade data!", widget_name); return FALSE; } - + return e_dialog_widget_hook_value (dialog, widget, value_var, info); } diff --git a/e-util/e-error.c b/e-util/e-error.c index 9f2a768c9b..94ad35f31a 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -45,7 +45,7 @@ #include "e-util-private.h" #include "e-error.h" -#define d(x) +#define d(x) struct _e_error_button { struct _e_error_button *next; @@ -110,7 +110,7 @@ static int map_response(const char *name) { int i; - + for (i=0;i<sizeof(response_map)/sizeof(response_map[0]);i++) if (!strcmp(name, response_map[i].name)) return response_map[i].id; @@ -169,7 +169,7 @@ ee_load(const char *path) char *tmp; d(printf("loading error file %s\n", path)); - + doc = e_xml_parse_file (path); if (doc == NULL) { g_warning("Error file '%s' not found", path); @@ -239,7 +239,7 @@ ee_load(const char *path) e->default_response = map_response(tmp); xmlFree(tmp); } - + tmp = (char *)xmlGetProp(error, (const unsigned char *)"scroll"); if (tmp) { if (!strcmp(tmp, "yes")) @@ -550,9 +550,9 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)scroll, w); gtk_box_pack_start((GtkBox *)hbox, scroll, FALSE, FALSE, 0); gtk_window_set_default_size ((GtkWindow *)dialog, 360, 180); - } else + } else gtk_box_pack_start((GtkBox *)hbox, w, FALSE, FALSE, 0); - + gtk_widget_show_all(hbox); gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0); @@ -562,16 +562,16 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) /** * e_error_new: - * @parent: + * @parent: * @tag: error identifier * @arg0: The first argument for the error formatter. The list must * be NULL terminated. - * + * * Creates a new error widget. The @tag argument is used to determine * which error to use, it is in the format domain:error-id. The NULL * terminated list of arguments, starting with @arg0 is used to fill * out the error definition. - * + * * Return value: A GtkDialog which can be used for showing an error * dialog asynchronously. **/ @@ -604,13 +604,13 @@ e_error_runv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) /** * e_error_run: - * @parent: - * @tag: - * @arg0: - * + * @parent: + * @tag: + * @arg0: + * * Sets up, displays, runs and destroys a standard evolution error * dialog based on @tag, which is in the format domain:error-id. - * + * * Return value: The response id of the button pressed. **/ int @@ -638,8 +638,8 @@ remove_parent(GtkWidget *w, GtkWidget *parent) /** * e_error_default_parent: - * @parent: - * + * @parent: + * * Bit of a hack, set a default parent that will be used to parent any * error boxes if none is supplied. * diff --git a/e-util/e-event.c b/e-util/e-event.c index 363cc7f91f..5ac51d10ee 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -132,9 +132,9 @@ ep_class_init(GObjectClass *klass) /** * e_event_get_type: - * + * * Standard GObject type function. Used to subclass EEvent. - * + * * Return value: The EEvent type. **/ GType @@ -161,9 +161,9 @@ e_event_get_type(void) * e_event_construct: * @ep: An instantiated but uninitialised EEvent. * @id: Event manager id. - * + * * Construct the base event instance with standard parameters. - * + * * Return value: Returns @ep. **/ EEvent *e_event_construct(EEvent *ep, const char *id) @@ -179,7 +179,7 @@ EEvent *e_event_construct(EEvent *ep, const char *id) * @items: A list of EEventItems event listeners to register on this event manager. * @freefunc: A function called when the @items list is no longer needed. * @data: callback data for @freefunc and for item event handlers. - * + * * Adds @items to the list of events listened to on the event manager @emp. * * Return value: An opaque key which can later be passed to remove_items. @@ -206,9 +206,9 @@ e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *da /** * e_event_remove_items: - * @emp: - * @handle: - * + * @emp: + * @handle: + * * Remove items previously added. They MUST have been previously * added, and may only be removed once. **/ @@ -226,7 +226,7 @@ e_event_remove_items(EEvent *emp, void *handle) g_slist_foreach(emp->priv->sorted, (GFunc)g_free, NULL); g_slist_free(emp->priv->sorted); emp->priv->sorted = NULL; - } + } } static int @@ -248,7 +248,7 @@ ee_cmp(const void *ap, const void *bp) * @ee: An initialised EEvent, potentially with registered event listeners. * @id: Event name. This will be compared against EEventItem.id. * @target: The target describing the event context. This will be implementation defined. - * + * * Emit an event. @target will automatically be freed once its * emission is complete. **/ @@ -272,7 +272,7 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target) for (;node->next;node=node->next) { GSList *l = node->events; - + for (;l;l=g_slist_next(l)) { struct _event_info *info; @@ -312,7 +312,7 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target) * @ep: An initialised EEvent instance. * @type: type, up to implementor * @size: The size of memory to allocate. This must be >= sizeof(EEventTarget). - * + * * Allocate a new event target suitable for this class. It is up to * the implementation to define the available target types and their * structure. @@ -338,7 +338,7 @@ void *e_event_target_new(EEvent *ep, int type, size_t size) * e_event_target_free: * @ep: An initialised EEvent instance on which this target was allocated. * @o: The target to free. - * + * * Free a target. This invokes the virtual free method on the EEventClass. **/ void @@ -526,17 +526,17 @@ emph_class_init(EPluginHookClass *klass) /** * e_event_hook_get_type: - * + * * Standard GObject function to get the EEvent object type. Used to * subclass EEventHook. - * + * * Return value: The type of the event hook class. **/ GType e_event_hook_get_type(void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof(EEventHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL, @@ -546,7 +546,7 @@ e_event_hook_get_type(void) emph_parent_class = g_type_class_ref(e_plugin_hook_get_type()); type = g_type_register_static(e_plugin_hook_get_type(), "EEventHook", &info, 0); } - + return type; } @@ -555,7 +555,7 @@ e_event_hook_get_type(void) * @klass: The derived EEventHook class. * @map: A map used to describe a single EEventTarget type for this * class. - * + * * Add a target map to a concrete derived class of EEvent. The target * map enumerates a single target type and th eenable mask bit names, * so that the type can be loaded automatically by the base EEvent class. diff --git a/e-util/e-event.h b/e-util/e-event.h index d75d550767..e7cafbc33f 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -49,10 +49,10 @@ typedef void (*EEventFactoryFunc)(EEvent *ee, void *); /** * enum _e_event_t - Event type. - * + * * @E_EVENT_PASS: A passthrough event handler which only receives the event. * @E_EVENT_SINK: A sink event handler swallows all events it processes. - * + * * The event type defines what type of event listener this is. * * Events should normally be @E_EVENT_PASS. @@ -64,7 +64,7 @@ enum _e_event_t { /** * struct _EEventItem - An event listener item. - * + * * @type: The type of the event listener. * @priority: A signed number signifying the priority of the event * listener. 0 should be used normally. This is used to order event @@ -78,7 +78,7 @@ enum _e_event_t { * @user_data: Callback data. * @enable: Target-specific mask to qualify the receipt of events. * This is target and implementation specific. - * + * * An EEventItem defines a specific event listening point on a given * EEvent object. When an event is broadcast onto an EEvent handler, * any matching EEventItems will be invoked in priority order. @@ -95,7 +95,7 @@ struct _EEventItem { /** * struct _EEventTarget - Base EventTarget. - * + * * @event: Parent object. * @type: Target type. Defined by the implementation. * @mask: Mask of this target. This is defined by the implementation, @@ -104,7 +104,7 @@ struct _EEventItem { * This defined a base EventTarget. This must be subclassed by * implementations to provide contextual data for events, and define * the enablement qualifiers. - * + * **/ struct _EEventTarget { struct _EEvent *event; /* used for virtual methods */ @@ -117,7 +117,7 @@ struct _EEventTarget { /** * struct _EEvent - An Event Manager. - * + * * @object: Superclass. * @priv: Private data. * @id: Id of this event manager. @@ -138,7 +138,7 @@ struct _EEvent { /** * struct _EEventClass - Event management type. - * + * * @object_class: Superclass. * @target_free: Virtual method to free the target. * @@ -187,7 +187,7 @@ typedef void (*EEventHookFunc)(struct _EPlugin *plugin, EEventTarget *target); /** * struct _EEventHook - An event hook. - * + * * @hook: Superclass. * * The EEventHook class loads and manages the meta-data required to @@ -202,13 +202,13 @@ struct _EEventHook { }; /** - * struct _EEventHookClass - - * - * @hook_class: + * struct _EEventHookClass - + * + * @hook_class: * @target_map: Table of EPluginHookTargetMaps which enumerate the * target types and enable bits of the implementing class. * @event: The EEvent instance on which all loaded events must be registered. - * + * * The EEventHookClass is an empty event hooking class, which must be * subclassed and initialised before use. * diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index 31ae5ffb8e..6c6e07e263 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -45,25 +45,25 @@ is_type_folder (const char *metadata, const char *search_type) xmlNodePtr node; xmlDocPtr doc; char *type; - + doc = e_xml_parse_file (metadata); if (!doc) { g_warning ("Cannot parse `%s'", metadata); return FALSE; } - + if (!(node = xmlDocGetRootElement (doc))) { g_warning ("`%s' corrupt: document contains no root node", metadata); xmlFreeDoc (doc); return FALSE; } - + if (!node->name || strcmp ((char *)node->name, "efolder") != 0) { g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); xmlFreeDoc (doc); return FALSE; } - + node = node->children; while (node != NULL) { if (node->name && !strcmp ((char *)node->name, "type")) { @@ -71,20 +71,20 @@ is_type_folder (const char *metadata, const char *search_type) if (!strcmp (type, search_type)) { xmlFreeDoc (doc); xmlFree (type); - + return TRUE; } - + xmlFree (type); - + break; } - + node = node->next; } - + xmlFreeDoc (doc); - + return FALSE; } @@ -101,7 +101,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) g_free (path); return; } - + if (!is_type_folder (path, type)) { g_free (path); goto try_subdirs; @@ -109,8 +109,8 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) d(g_message ("Found '%s'", dirname)); *dir_list = g_slist_prepend (*dir_list, g_strdup (dirname)); - - g_free (path); + + g_free (path); try_subdirs: @@ -119,32 +119,32 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) g_free (path); return; } - + if (!(dir = g_dir_open (path, 0, &error))) { g_warning ("cannot open `%s': %s", path, error->message); g_error_free (error); g_free (path); return; } - + while ((name = g_dir_read_name (dir))) { char *full_path; - + if (*name == '.') continue; - + full_path = g_build_filename (path, name, NULL); if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { g_free (full_path); continue; } - + e_folder_map_dir (full_path, type, dir_list); g_free (full_path); } - + g_dir_close (dir); - + g_free (path); } @@ -152,34 +152,34 @@ GSList * e_folder_map_local_folders (char *local_dir, char *type) { const char *name; - GDir *dir; + GDir *dir; GSList *dir_list = NULL; GError *error = NULL; - + if (!(dir = g_dir_open (local_dir, 0, &error))) { g_warning ("cannot open `%s': %s", local_dir, error->message); g_error_free (error); return NULL; } - + while ((name = g_dir_read_name (dir))) { char *full_path; - + if (*name == '.') continue; - + full_path = g_build_filename (local_dir, name, NULL); d(g_message ("Looking in %s", full_path)); if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { g_free (full_path); continue; } - + e_folder_map_dir (full_path, type, &dir_list); g_free (full_path); } - + g_dir_close (dir); return dir_list; diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index cb126df0cf..97118eddd0 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -51,10 +51,10 @@ /** * e_fsutils_usage: - * @path: - * + * @path: + * * Calculate the amount of disk space used by a given path. - * + * * Return value: The number of 1024 byte blocks used by the * filesystem. **/ @@ -118,10 +118,10 @@ fail: /** * e_fsutils_avail: - * @path: - * + * @path: + * * Find the available disk space at the given path. - * + * * Return value: -1 if it could not be determined, otherwise the * number of disk blocks, expressed as system-independent, 1024 byte * blocks. diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index 18f9c9b50f..5a828dedf6 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -69,7 +69,7 @@ GtkWidget *e_create_image_widget(gchar *name, { GtkWidget *alignment = NULL; GtkWidget *w; - + if (string1) { w = e_icon_factory_get_image (string1, E_ICON_SIZE_DIALOG); diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h index 9d2262f9a7..73f40c9977 100644 --- a/e-util/e-html-utils.h +++ b/e-util/e-html-utils.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* e-html-utils.c */ -/* +/* * Copyright (C) 2000 Ximian, Inc. * Author: Dan Winship <danw@ximian.com> * diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 52a7f14e82..78b8122cdd 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -110,22 +110,22 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) int width; GDir *dir; char *x; - + if (!(dir = g_dir_open (EVOLUTION_ICONSDIR, 0, NULL))) { goto done; } - + /* scan icon directories looking for an icon with a size >= the size we need. */ while ((dent = g_dir_read_name (dir))) { if (!(dent[0] >= '1' && dent[0] <= '9')) continue; - + if (((width = strtol (dent, &x, 10)) < size) || *x != 'x') continue; - + if (((strtol (x + 1, &x, 10)) != width) || *x != '\0') continue; - + /* if the icon exists in this directory, we can [use/scale] it */ g_free (filename); basename = g_strconcat (icon_name, ".png", NULL); @@ -137,7 +137,7 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) if ((unscaled = gdk_pixbuf_new_from_file (filename, NULL))) break; } - + g_dir_close (dir); } else { gchar *size_x_size; @@ -213,8 +213,8 @@ e_icon_factory_init (void) icon_theme = gtk_icon_theme_get_default (); gtk_icon_theme_append_search_path (icon_theme, - EVOLUTION_DATADIR G_DIR_SEPARATOR_S - "evolution" G_DIR_SEPARATOR_S + EVOLUTION_DATADIR G_DIR_SEPARATOR_S + "evolution" G_DIR_SEPARATOR_S BASE_VERSION G_DIR_SEPARATOR_S "icons"); g_signal_connect ( icon_theme, "changed", @@ -386,12 +386,12 @@ e_icon_factory_get_icon_list (const char *icon_name) for (i = 0; i < G_N_ELEMENTS (icon_list_sizes); i++) { size = icon_list_sizes[i]; sprintf (icon_key, "%dx%d/%s", size, size, icon_name); - + if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) { if ((icon = load_icon (icon_key, icon_name, size, FALSE))) g_hash_table_insert (name_to_icon, icon->name, icon); } - + if (icon && icon->pixbuf) { list = g_list_prepend (list, icon->pixbuf); g_object_ref (icon->pixbuf); diff --git a/e-util/e-import.c b/e-util/e-import.c index 7cf02c07e5..92a54f59ac 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -47,7 +47,7 @@ #include <glib/gi18n.h> -#define d(x) +#define d(x) #define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_import_get_type())) @@ -124,10 +124,10 @@ ep_base_init(GObjectClass *klass) /** * e_import_get_type: - * + * * Standard GObject method. Used to subclass for the concrete * implementations. - * + * * Return value: EImport type. **/ GType @@ -154,9 +154,9 @@ e_import_get_type(void) * e_import_construct: * @ep: The instance to initialise. * @id: The name of the instance. - * + * * Used by implementing classes to initialise base parameters. - * + * * Return value: @ep is returned. **/ EImport *e_import_construct(EImport *ep, const char *id) @@ -175,13 +175,13 @@ EImport *e_import_new(const char *id) /** * e_import_import: - * @ei: + * @ei: * @t: Target to import. * @im: Importer to use. * @status: Status callback, called with progress information. * @done: Complete callback, will always be called once complete. * @data: - * + * * Run the import function of the selected importer. Once the * importer has finished, it MUST call the e_import_complete() * function. This allows importers to run in synchronous or @@ -213,11 +213,11 @@ void e_import_cancel(EImport *ei, EImportTarget *t, EImportImporter *im) * @ei: * @target: Target of interest * @im: Importer to get widget of - * + * * Gets a widget that the importer uses to configure its * destination. This widget should be packed into a container * widget. It should not be shown_all. - * + * * Return value: NULL if the importer doesn't support/require * a destination. **/ @@ -232,9 +232,9 @@ e_import_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) /** * e_import_complete: - * @ei: + * @ei: * @target: Target just completed (unused currently) - * + * * Signify that an import is complete. This must be called by * importer implementations when they are done. **/ @@ -252,14 +252,14 @@ void e_import_status(EImport *ei, EImportTarget *target, const char *what, int p /** * e_import_get_importers: - * @emp: - * @target: - * + * @emp: + * @target: + * * Get a list of importers. If @target is supplied, then only * importers which support the type and location specified by the * target are listed. If @target is NULL, then all importers are * listed. - * + * * Return value: A list of importers. The list should be freed when * no longer needed. **/ @@ -292,7 +292,7 @@ e_import_get_importers(EImport *emp, EImportTarget *target) * @freefunc: If supplied, called to free the importer node * when it is no longer needed. * @data: Data for the callback. - * + * **/ void e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, void *data) @@ -343,7 +343,7 @@ void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f) * @ep: Parent EImport object. * @type: type, up to implementor * @size: Size of object to allocate. - * + * * Allocate a new import target suitable for this class. Implementing * classes will define the actual content of the target. **/ @@ -369,7 +369,7 @@ void *e_import_target_new(EImport *ep, int type, size_t size) * e_import_target_free: * @ep: Parent EImport object. * @o: The target to fre. - * + * * Free a target. The implementing class can override this method to * free custom targets. **/ @@ -583,7 +583,7 @@ emph_class_init(EPluginHookClass *klass) /** @HookClass: Evolution Importers * @Id: org.gnome.evolution.import:1.0 * @Target: EImportTarget - * + * * A hook for data importers. **/ @@ -600,16 +600,16 @@ emph_class_init(EPluginHookClass *klass) /** * e_import_hook_get_type: - * + * * Standard GObject function to get the object type. - * + * * Return value: The EImportHook class type. **/ GType e_import_hook_get_type(void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof(EImportHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL, @@ -619,7 +619,7 @@ e_import_hook_get_type(void) emph_parent_class = g_type_class_ref(e_plugin_hook_get_type()); type = g_type_register_static(e_plugin_hook_get_type(), "EImportHook", &info, 0); } - + return type; } @@ -629,7 +629,7 @@ e_import_hook_get_type(void) * @klass: The dervied EimportHook class. * @map: A map used to describe a single EImportTarget type for this * class. - * + * * Add a targe tmap to a concrete derived class of EImport. The * target map enumates the target types available for the implenting * class. diff --git a/e-util/e-import.h b/e-util/e-import.h index 40bd29655a..15f2e3aea8 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -60,8 +60,8 @@ enum _e_import_target_t { }; /** - * struct _EImportImporter - - * + * struct _EImportImporter - + * * @type: target type * @priority: Priority of importer. Higher values will be processed first. * @supported: Callback to see if this target is supported by the importer. @@ -90,13 +90,13 @@ struct _EImportImporter { /** * struct _EImportTarget - importation context. - * + * * @import: The parent object. * @type: The type of target, defined by implementing classes. * @data: This can be used to store run-time information * about this target. Any allocated data must be set so * as to free it when the target is freed. - * + * * The base target object is used as the parent and placeholder for * import context for a given importer. **/ @@ -128,7 +128,7 @@ struct _EImportTargetHome { /** * struct _EImport - An importer management object. - * + * * @object: Superclass. * @id: ID of importer. * @status: Status callback of current running import. @@ -148,7 +148,7 @@ struct _EImport { /** * struct _EImportClass - Importer manager abstract class. - * + * * @object_class: Superclass. * @factories: A list of factories registered on this type of * importuration manager. @@ -157,7 +157,7 @@ struct _EImport { * into changes on the target to propery drive the manager. * @target_free: A virtual method used to free the target in an * implementation-defined way. - * + * **/ struct _EImportClass { GObjectClass object_class; @@ -223,11 +223,11 @@ struct _EImportHookImporter { /** * struct _EImportHook - Plugin hook for importuration windows. - * + * * @hook: Superclass. * @groups: A list of EImportHookGroup's of all importuration windows * this plugin hooks into. - * + * **/ struct _EImportHook { EPluginHook hook; @@ -238,7 +238,7 @@ struct _EImportHook { /** * struct _EImportHookClass - Abstract class for importuration window * plugin hooks. - * + * * @hook_class: Superclass. * @target_map: A table of EImportHookTargetMap structures describing * the possible target types supported by this class. @@ -247,7 +247,7 @@ struct _EImportHook { * * This is an abstract class defining the plugin hook point for * importuration windows. - * + * **/ struct _EImportHookClass { EPluginHookClass hook_class; diff --git a/e-util/e-menu.c b/e-util/e-menu.c index c9e6d098b4..0582d35c96 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -148,9 +148,9 @@ em_base_init(GObjectClass *klass) /** * e_menu_get_type: - * + * * Standard GObject type function. Used to subclass this type only. - * + * * Return value: The EMenu object type. **/ GType @@ -178,9 +178,9 @@ e_menu_get_type(void) * e_menu_construct: * @em: An instantiated but uninitislied EPopup. * @menuid: The unique identifier for this menu. - * + * * Construct the base menu instance based on the parameters. - * + * * Return value: Returns @em. **/ EMenu *e_menu_construct(EMenu *em, const char *menuid) @@ -225,7 +225,7 @@ EMenu *e_menu_construct(EMenu *em, const char *menuid) * associated with the menus. * @freefunc: If supplied, called when the menu items are no longer needed. * @data: user-data passed to @freefunc and activate callbacks. - * + * * Add new EMenuItems to the menu's. This may be called any number of * times before the menu is first activated to hook onto any of the * menu items defined for that view. @@ -281,9 +281,9 @@ e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EM /** * e_menu_remove_items: - * @emp: - * @handle: - * + * @emp: + * @handle: + * * Remove menu items previously added. **/ void @@ -298,7 +298,7 @@ e_menu_remove_items(EMenu *emp, void *handle) if (emp->uic) { for (l = node->items;l;l=g_slist_next(l)) { EMenuItem *item = l->data; - + bonobo_ui_component_remove_verb(emp->uic, item->verb); } } @@ -341,7 +341,7 @@ em_activate(BonoboUIComponent *uic, void *data, const char *cname) * @em: An initialised EMenu. * @uic: The BonoboUI component for this views menu's. * @act: If %TRUE, then the control is being activated. - * + * * This is called by the owner of the component, control, or view to * pass on the activate or deactivate control signals. If the view is * being activated then the callbacks and menu items are setup, @@ -424,7 +424,7 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, int act) * e_menu_update_target: * @em: An initialised EMenu. * @tp: Target, after this call the menu owns the target. - * + * * Change the target for the menu. Once the target is changed, the * sensitivity state of the menu items managed by @em is re-evaluated * and the physical menu's updated to reflect it. @@ -477,13 +477,13 @@ void e_menu_update_target(EMenu *em, void *tp) * called on all menus. * @func: An EMenuFactoryFunc callback. * @data: Callback data for @func. - * + * * Add a menu factory which will be called when the menu @menuid is * created. The factory is free to add new items as it wishes to the * menu provided in the callback. * * TODO: Make the menuid a pattern? - * + * * Return value: A handle to the factory. **/ EMenuFactory * @@ -515,7 +515,7 @@ e_menu_class_add_factory(EMenuClass *klass, const char *menuid, EMenuFactoryFunc * e_menu_class_remove_factory: * @klass: Class on which the factory was originally added. * @f: Factory handle. - * + * * Remove a popup factory. This must only be called once, and must * only be called using a valid factory handle @f. After this call, * @f is undefined. @@ -533,7 +533,7 @@ e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f) * @ep: An EMenu to which this target applies. * @type: Target type, up to implementation. * @size: Size of memory to allocate. Must be >= sizeof(EMenuTarget). - * + * * Allocate a new menu target suitable for this class. @size is used * to specify the actual target size, which may vary depending on the * implementing class. @@ -559,7 +559,7 @@ void *e_menu_target_new(EMenu *ep, int type, size_t size) * e_menu_target_free: * @ep: EMenu on which the target was allocated. * @o: Tareget to free. - * + * * Free a target. **/ void @@ -886,17 +886,17 @@ emph_class_init(EPluginHookClass *klass) /** * e_menu_hook_get_type: - * + * * Standard GObject function to get the object type. Used to subclass * EMenuHook. - * + * * Return value: The type of the menu hook class. **/ GType e_menu_hook_get_type(void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof(EMenuHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL, @@ -906,7 +906,7 @@ e_menu_hook_get_type(void) emph_parent_class = g_type_class_ref(e_plugin_hook_get_type()); type = g_type_register_static(e_plugin_hook_get_type(), "EMenuHook", &info, 0); } - + return type; } @@ -914,7 +914,7 @@ e_menu_hook_get_type(void) * e_menu_hook_class_add_target_map: * @klass: The derived EMenuHook class. * @map: A map used to describe a single EMenuTarget for this class. - * + * * Adds a target map to a concrete derived class of EMenu. The target * map enumerates a single target type, and the enable mask bit names, * so that the type can be loaded automatically by the EMenu class. diff --git a/e-util/e-menu.h b/e-util/e-menu.h index 2692878172..c5548a335b 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -53,13 +53,13 @@ typedef void (*EMenuItemsFunc)(EMenu *, GSList *items, GSList *uifiles, GSList * /** * enum _e_menu_t - Menu item type. - * + * * @E_MENU_ITEM: Normal menu item. * @E_MENU_TOGGLE: Toggle menu item. * @E_MENU_RADIO: unimplemented. * @E_MENU_TYPE_MASK: Mask used to separate item type from option bits. * @E_MENU_ACTIVE: Whether a toggle item is active. - * + * * The type of menu items which are supported by the menu system. **/ enum _e_menu_t { @@ -72,7 +72,7 @@ enum _e_menu_t { /** * struct _EMenuItem - A BonoboUI menu item. - * + * * @type: Menu item type. %E_MENU_ITEM or %E_MENU_TOGGLE. * @path: BonoboUI Path to the menu item. * @verb: BonoboUI verb for the menu item. @@ -82,7 +82,7 @@ enum _e_menu_t { * @user_data: User data for item. * @visible: Visibility mask, unimplemented. * @enable: Sensitivity mask, combined with the target mask. - * + * * An EMenuItem defines a single menu item. This menu item is used to * hook onto callbacks from the bonobo menus, but not to build or * merge the menu itself. @@ -99,7 +99,7 @@ struct _EMenuItem { /** * struct _EMenuPixmap - A menu icon holder. - * + * * @command: The path to the command or verb to which this pixmap belongs. * @name: The name of the icon. Either an icon-theme name or the full * pathname of the icon. @@ -119,11 +119,11 @@ struct _EMenuPixmap { /** * struct _EMenuUIFile - A meu UI file holder. - * + * * @appdir: TODO; should this be handled internally. * @appname: TODO; should this be handled internally. * @filename: The filename of the BonoboUI XML menu definition. - * + * * These values are passed directly to bonobo_ui_util_set_ui() when * the menu is activated. **/ @@ -135,7 +135,7 @@ struct _EMenuUIFile { /** * struct _EMenuTarget - A BonoboUI menu target definition. - * + * * @menu: The parent menu object, used for virtual methods on the target. * @widget: The parent widget where available. In some cases the type * of this object is part of the published api for the target, in @@ -144,7 +144,7 @@ struct _EMenuUIFile { * @type: Target type. This will be defined by the implementation. * @mask: Target mask. This is used to sensitise show items based on * their definition in EMenuItem. - * + * * An EMenuTarget defines the context for a specific view instance. * It is used to enable and show menu items, and to provide contextual * data to menu invocations. @@ -156,20 +156,20 @@ struct _EMenuTarget { guint32 type; /* for implementors */ guint32 mask; /* enable/visible mask */ - + /* implementation fields follow */ }; /** * struct _EMenu - A BonoboUI menu manager object. - * + * * @object: Superclass. * @priv: Private data. * @menuid: The id of this menu instance. * @uic: The current BonoboUIComponent which stores the actual menu * items this object manages. * @target: The current target for the view. - * + * * The EMenu manager object manages the mappings between EMenuItems * and the BonoboUI menus loaded from UI files. **/ @@ -183,8 +183,8 @@ struct _EMenu { }; /** - * struct _EMenuClass - - * + * struct _EMenuClass - + * * @object_class: Superclass type. * @factories: A list of factories for this particular class of main menu. * @target_free: Virtual method to free the menu target. The base @@ -245,7 +245,7 @@ typedef void (*EMenuHookFunc)(struct _EPlugin *plugin, EMenuTarget *target); /** * struct _EMenuHookMenu - A group of items targetting a specific menu. - * + * * @hook: Parent pointer. * @id: The identifier of the menu or view to which these items belong. * @target_type: The target number of the type of target these menu @@ -254,7 +254,7 @@ typedef void (*EMenuHookFunc)(struct _EPlugin *plugin, EMenuTarget *target); * @uis: A list of filenames of the BonoboUI files that need to be * loaded for an active view. * @pixmaps: A list of EMenuHookPixmap structures for the menus. - * + * * This structure is used to keep track of all of the items that a * plugin wishes to add to specific menu. This is used internally by * a factory method defined by the EMenuHook to add the right menu @@ -271,7 +271,7 @@ struct _EMenuHookMenu { /** * struct _EMenuHook - A BonoboUI menu hook. - * + * * @hook: Superclass. * @menus: A list of EMenuHookMenus for all menus registered on this * hook type. @@ -287,13 +287,13 @@ struct _EMenuHook { /** * struct _EMenuHookClass - Menu hook type. - * + * * @hook_class: Superclass type. * @target_map: Table of EluginHookTargetMaps which enumerate the * target types and enable bits of the implementing class. * @menu_class: The EMenuClass of the corresponding popup manager for * implementing the class. - * + * * The EMenuHookClass is an empty concrete class. It must be * subclassed and initialised appropriately to perform useful work. * diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 02a3e784fd..9ff294f929 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c |