aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-filter-bar.c
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc/e-filter-bar.c')
-rw-r--r--widgets/misc/e-filter-bar.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index a113d1f101..77c20d506b 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -55,7 +55,7 @@ rule_editor_destroyed (EFilterBar *filter_bar, GObject *deadbeef)
}
static void
-rule_advanced_response (GtkWidget *dialog, int response, void *data)
+rule_advanced_response (GtkWidget *dialog, gint response, gpointer data)
{
EFilterBar *filter_bar = data;
/* the below generates a compiler warning about incompatible pointer types */
@@ -163,7 +163,7 @@ save_search_dialog (ESearchBar *search_bar)
}
static void
-menubar_activated (ESearchBar *search_bar, int id, void *data)
+menubar_activated (ESearchBar *search_bar, gint id, gpointer data)
{
EFilterBar *filter_bar = (EFilterBar *)search_bar;
GtkWidget *dialog;
@@ -208,11 +208,11 @@ menubar_activated (ESearchBar *search_bar, int id, void *data)
}
static void
-option_changed (ESearchBar *search_bar, void *data)
+option_changed (ESearchBar *search_bar, gpointer data)
{
EFilterBar *filter_bar = (EFilterBar *)search_bar;
- int id = e_search_bar_get_item_id (search_bar);
- char *query;
+ gint id = e_search_bar_get_item_id (search_bar);
+ gchar *query;
d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search));
@@ -256,16 +256,16 @@ dup_item_no_subitems (ESearchBarItem *dest,
}
static GArray *
-build_items (ESearchBar *search_bar, ESearchBarItem *items, int type, int *start, GPtrArray *rules)
+build_items (ESearchBar *search_bar, ESearchBarItem *items, gint type, gint *start, GPtrArray *rules)
{
FilterRule *rule = NULL;
EFilterBar *filter_bar = (EFilterBar *)search_bar;
- int id = 0, i;
+ gint id = 0, i;
GArray *menu = g_array_new (FALSE, FALSE, sizeof (ESearchBarItem));
ESearchBarItem item = { NULL, -1, 2 };
const gchar *source;
GSList *gtksux = NULL;
- int num;
+ gint num;
for (i=0;i<rules->len;i++)
gtksux = g_slist_prepend(gtksux, rules->pdata[i]);
@@ -357,7 +357,7 @@ build_items (ESearchBar *search_bar, ESearchBarItem *items, int type, int *start
static void
free_built_items (GArray *menu)
{
- int i;
+ gint i;
for (i = 0; i < menu->len; i ++) {
ESearchBarItem *item;
@@ -383,7 +383,7 @@ generate_menu (ESearchBar *search_bar, ESearchBarItem *items)
static void
free_items (ESearchBarItem *items)
{
- int i;
+ gint i;
for (i = 0; items[i].id != -1; i++)
g_free (items[i].text);
@@ -398,7 +398,7 @@ set_menu (ESearchBar *search_bar, ESearchBarItem *items)
{
EFilterBar *filter_bar = E_FILTER_BAR (search_bar);
ESearchBarItem *default_items;
- int i, num;
+ gint i, num;
if (filter_bar->default_items)
free_items (filter_bar->default_items);
@@ -472,7 +472,7 @@ filter_bar_get_property (GObject *object,
switch (property_id) {
case PROP_QUERY: {
- char *text = e_search_bar_get_text (E_SEARCH_BAR (filter_bar));
+ gchar *text = e_search_bar_get_text (E_SEARCH_BAR (filter_bar));
/* empty search text means searching turned off */
if (filter_bar->current_query && text && *text) {
@@ -490,15 +490,15 @@ filter_bar_get_property (GObject *object,
case PROP_STATE: {
/* FIXME: we should have ESearchBar save its own state to the xmlDocPtr */
xmlChar *xmlbuf;
- char *text, buf[12];
- int searchscope, item_id, n, view_id;
+ gchar *text, buf[12];
+ gint searchscope, item_id, n, view_id;
xmlNodePtr root, node;
xmlDocPtr doc;
item_id = e_search_bar_get_item_id ((ESearchBar *) filter_bar);
- doc = xmlNewDoc ((const unsigned char *)"1.0");
- root = xmlNewDocNode (doc, NULL, (const unsigned char *)"state", NULL);
+ doc = xmlNewDoc ((const guchar *)"1.0");
+ root = xmlNewDocNode (doc, NULL, (const guchar *)"state", NULL);
xmlDocSetRootElement (doc, root);
searchscope = e_search_bar_get_search_scope ((ESearchBar *) filter_bar);
view_id = e_search_bar_get_viewitem_id ((ESearchBar *) filter_bar);
@@ -508,28 +508,28 @@ filter_bar_get_property (GObject *object,
if (item_id == E_FILTERBAR_ADVANCED_ID) {
/* advanced query, save the filterbar state */
- node = xmlNewChild (root, NULL, (const unsigned char *)"filter-bar", NULL);
+ node = xmlNewChild (root, NULL, (const guchar *)"filter-bar", NULL);
sprintf (buf, "%d", search_bar->last_search_option);
- xmlSetProp (node, (const unsigned char *)"item_id", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"item_id", (guchar *)buf);
sprintf (buf, "%d", searchscope);
- xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"searchscope", (guchar *)buf);
sprintf (buf, "%d", view_id);
- xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"view_id", (guchar *)buf);
xmlAddChild (node, filter_rule_xml_encode (filter_bar->current_query));
} else {
/* simple query, save the searchbar state */
text = e_search_bar_get_text ((ESearchBar *) filter_bar);
- node = xmlNewChild (root, NULL, (const unsigned char *)"search-bar", NULL);
- xmlSetProp (node, (const unsigned char *)"text", (unsigned char *)(text ? text : ""));
+ node = xmlNewChild (root, NULL, (const guchar *)"search-bar", NULL);
+ xmlSetProp (node, (const guchar *)"text", (guchar *)(text ? text : ""));
sprintf (buf, "%d", item_id);
- xmlSetProp (node, (const unsigned char *)"item_id", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"item_id", (guchar *)buf);
sprintf (buf, "%d", searchscope);
- xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"searchscope", (guchar *)buf);
sprintf (buf, "%d", view_id);
- xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf);
+ xmlSetProp (node, (const guchar *)"view_id", (guchar *)buf);
g_free (text);
}
@@ -538,7 +538,7 @@ filter_bar_get_property (GObject *object,
/* remap to glib memory */
text = g_malloc (n + 1);
- memcpy (text, (char *)xmlbuf, n);
+ memcpy (text, (gchar *)xmlbuf, n);
text[n] = '\0';
xmlFree (xmlbuf);
@@ -552,12 +552,12 @@ filter_bar_get_property (GObject *object,
}
static int
-xml_get_prop_int (xmlNodePtr node, const char *prop)
+xml_get_prop_int (xmlNodePtr node, const gchar *prop)
{
- char *buf;
- int ret;
+ gchar *buf;
+ gint ret;
- if ((buf = (char *)xmlGetProp (node, (unsigned char *)prop))) {
+ if ((buf = (gchar *)xmlGetProp (node, (guchar *)prop))) {
ret = strtol (buf, NULL, 10);
xmlFree (buf);
} else {
@@ -576,26 +576,26 @@ filter_bar_set_property (GObject *object,
EFilterBar *filter_bar = (EFilterBar *) object;
ESearchBar *search_bar = E_SEARCH_BAR (object);
xmlNodePtr root, node;
- const char *state;
+ const gchar *state;
xmlDocPtr doc;
gboolean rule_set = FALSE, is_cur_folder=FALSE;
- int view_id, scope, item_id;
+ gint view_id, scope, item_id;
switch (property_id) {
case PROP_STATE:
if ((state = g_value_get_string (value))) {
- if (!(doc = xmlParseDoc ((unsigned char *) state)))
+ if (!(doc = xmlParseDoc ((guchar *) state)))
return;
root = doc->children;
- if (strcmp ((char *)root->name, "state") != 0) {
+ if (strcmp ((gchar *)root->name, "state") != 0) {
xmlFreeDoc (doc);
return;
}
node = root->children;
while (node != NULL) {
- if (!strcmp ((char *)node->name, "filter-bar")) {
+ if (!strcmp ((gchar *)node->name, "filter-bar")) {
FilterRule *rule = NULL;
@@ -638,7 +638,7 @@ filter_bar_set_property (GObject *object,
search_bar->block_search = FALSE;
filter_bar->current_query = (FilterRule *)filter_bar->option_rules->pdata[item_id - filter_bar->option_base];
if (filter_bar->config && filter_bar->current_query) {
- char *query = e_search_bar_get_text (search_bar);
+ gchar *query = e_search_bar_get_text (search_bar);
filter_bar->config (filter_bar, filter_bar->current_query, item_id, query, filter_bar->config_data);
g_free (query);
@@ -651,9 +651,9 @@ filter_bar_set_property (GObject *object,
filter_bar->setquery = FALSE;
break;
- } else if (!strcmp ((char *)node->name, "search-bar")) {
- int subitem_id, item_id, scope, view_id;
- char *text;
+ } else if (!strcmp ((gchar *)node->name, "search-bar")) {
+ gint subitem_id, item_id, scope, view_id;
+ gchar *text;
GtkStyle *style = gtk_widget_get_default_style ();
/* set the text first (it doesn't emit a signal) */
@@ -674,7 +674,7 @@ filter_bar_set_property (GObject *object,
scope = xml_get_prop_int (node, "searchscope");
e_search_bar_set_search_scope (E_SEARCH_BAR (filter_bar), scope);
- text = (char *)xmlGetProp (node, (const unsigned char *)"text");
+ text = (gchar *)xmlGetProp (node, (const guchar *)"text");
e_search_bar_set_text (E_SEARCH_BAR (filter_bar), text);
if (text && *text) {
filter_bar->current_query = (FilterRule *)filter_bar->option_rules->pdata[item_id - filter_bar->option_base];
@@ -866,10 +866,10 @@ e_filter_bar_get_type (void)
EFilterBar *
e_filter_bar_lite_new (RuleContext *context,
- const char *systemrules,
- const char *userrules,
+ const gchar *systemrules,
+ const gchar *userrules,
EFilterBarConfigRule config,
- void *data)
+ gpointer data)
{
EFilterBar *bar;
@@ -882,8 +882,8 @@ e_filter_bar_lite_new (RuleContext *context,
void
e_filter_bar_new_construct (RuleContext *context,
- const char *systemrules,
- const char *userrules,
+ const gchar *systemrules,
+ const gchar *userrules,
EFilterBarConfigRule config,
gpointer data)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 15:54:21 +0800