X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmerge.c;h=7076c134a44e5e17452acbbbeeff227c8d34bea1;hb=3943dd1240c9a6ef449fccfd52e7302baf9c5ae4;hp=f7db354fee43ed4584b7678a7bcbbb06dd929c03;hpb=8016d6f4fe8f4970ce615d53d2d541be6afef850;p=glabels diff --git a/src/merge.c b/src/merge.c index f7db354f..7076c134 100644 --- a/src/merge.c +++ b/src/merge.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "debug.h" @@ -69,21 +69,21 @@ static GList *backends = NULL; /* Private function prototypes. */ /*========================================================*/ -static void gl_merge_finalize (GObject *object); +static void gl_merge_finalize (GObject *object); -static void merge_open (glMerge *merge); +static void merge_open (glMerge *merge); -static void merge_close (glMerge *merge); +static void merge_close (glMerge *merge); -static glMergeRecord *merge_get_record (glMerge *merge); +static glMergeRecord *merge_get_record (glMerge *merge); -static void merge_free_record (glMergeRecord **record); +static void merge_free_record (glMergeRecord **record); -static glMergeRecord *merge_dup_record (glMergeRecord *record); +static glMergeRecord *merge_dup_record (const glMergeRecord *record); -static void merge_free_record_list (GList **record_list); +static void merge_free_record_list (GList **record_list); -static GList *merge_dup_record_list (GList *record_list); +static GList *merge_dup_record_list (GList *record_list); @@ -166,6 +166,8 @@ gl_merge_get_descriptions (void) GList *p; Backend *backend; + /* Translators: "None" here means that no document-merge source or + * method has been selected. */ descriptions = g_list_append (descriptions, g_strdup(_("None"))); for ( p=backends; p!=NULL; p=p->next) { @@ -224,7 +226,7 @@ gl_merge_description_to_name (gchar *description) /*****************************************************************************/ /* Boilerplate object stuff. */ /*****************************************************************************/ -G_DEFINE_TYPE (glMerge, gl_merge, G_TYPE_OBJECT); +G_DEFINE_TYPE (glMerge, gl_merge, G_TYPE_OBJECT) static void gl_merge_class_init (glMergeClass *class) @@ -274,7 +276,7 @@ gl_merge_finalize (GObject *object) /* New merge object. */ /*****************************************************************************/ glMerge * -gl_merge_new (gchar *name) +gl_merge_new (const gchar *name) { glMerge *merge = NULL; GList *p; @@ -285,7 +287,7 @@ gl_merge_new (gchar *name) for (p=backends; p!=NULL; p=p->next) { backend = (Backend *)p->data; - if (g_strcasecmp(name, backend->name) == 0) { + if (g_ascii_strcasecmp(name, backend->name) == 0) { merge = GL_MERGE (g_object_newv (backend->type, backend->n_params, @@ -299,7 +301,7 @@ gl_merge_new (gchar *name) } } - if ( (merge == NULL) && (g_strcasecmp (name, "None") != 0)) { + if ( (merge == NULL) && (g_ascii_strcasecmp (name, "None") != 0)) { g_message ("Unknown merge backend \"%s\"", name); } @@ -312,7 +314,7 @@ gl_merge_new (gchar *name) /* Duplicate merge. */ /*****************************************************************************/ glMerge * -gl_merge_dup (glMerge *src_merge) +gl_merge_dup (const glMerge *src_merge) { glMerge *dst_merge; @@ -349,7 +351,7 @@ gl_merge_dup (glMerge *src_merge) /* Get name of merge. */ /*****************************************************************************/ gchar * -gl_merge_get_name (glMerge *merge) +gl_merge_get_name (const glMerge *merge) { gl_debug (DEBUG_MERGE, ""); @@ -366,7 +368,7 @@ gl_merge_get_name (glMerge *merge) /* Get description of merge. */ /*****************************************************************************/ gchar * -gl_merge_get_description (glMerge *merge) +gl_merge_get_description (const glMerge *merge) { gl_debug (DEBUG_MERGE, ""); @@ -383,7 +385,7 @@ gl_merge_get_description (glMerge *merge) /* Get source type of merge. */ /*****************************************************************************/ glMergeSrcType -gl_merge_get_src_type (glMerge *merge) +gl_merge_get_src_type (const glMerge *merge) { gl_debug (DEBUG_MERGE, ""); @@ -400,8 +402,8 @@ gl_merge_get_src_type (glMerge *merge) /* Set src of merge. */ /*****************************************************************************/ void -gl_merge_set_src (glMerge *merge, - gchar *src) +gl_merge_set_src (glMerge *merge, + const gchar *src) { GList *record_list = NULL; glMergeRecord *record; @@ -456,7 +458,7 @@ gl_merge_set_src (glMerge *merge, /* Get src of merge. */ /*****************************************************************************/ gchar * -gl_merge_get_src (glMerge *merge) +gl_merge_get_src (const glMerge *merge) { gl_debug (DEBUG_MERGE, ""); @@ -473,7 +475,7 @@ gl_merge_get_src (glMerge *merge) /* Get Key List. */ /*****************************************************************************/ GList * -gl_merge_get_key_list (glMerge *merge) +gl_merge_get_key_list (const glMerge *merge) { GList *key_list = NULL; @@ -521,7 +523,7 @@ gl_merge_free_key_list (GList **key_list) /* Get Key List. */ /*****************************************************************************/ gchar * -gl_merge_get_primary_key (glMerge *merge) +gl_merge_get_primary_key (const glMerge *merge) { gchar *key = NULL; @@ -641,7 +643,7 @@ merge_free_record (glMergeRecord **record) /* Duplicate a merge record (list of fields) */ /*---------------------------------------------------------------------------*/ static glMergeRecord * -merge_dup_record (glMergeRecord *record) +merge_dup_record (const glMergeRecord *record) { glMergeRecord *dest_record; GList *p; @@ -674,8 +676,8 @@ merge_dup_record (glMergeRecord *record) /* Find key in given record and evaluate. */ /*****************************************************************************/ gchar * -gl_merge_eval_key (glMergeRecord *record, - gchar *key) +gl_merge_eval_key (const glMergeRecord *record, + const gchar *key) { GList *p; @@ -704,7 +706,7 @@ gl_merge_eval_key (glMergeRecord *record, /* Read all records from merge source. */ /*****************************************************************************/ const GList * -gl_merge_get_record_list (glMerge *merge) +gl_merge_get_record_list (const glMerge *merge) { gl_debug (DEBUG_MERGE, ""); @@ -767,7 +769,7 @@ merge_dup_record_list (GList *record_list) /* Count selected records. */ /*****************************************************************************/ gint -gl_merge_get_record_count (glMerge *merge) +gl_merge_get_record_count (const glMerge *merge) { GList *p; glMergeRecord *record;