Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

2 files changed, 55 insertions, 66 deletions

diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade
index ecd59b6d..1e2677af 100644
--- a/src/gui-wizard-gtk/wizard.glade
+++ b/src/gui-wizard-gtk/wizard.glade
@@ -2,8 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkWindow" id="window0">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_0">
@@ -11,7 +9,6 @@
         <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="lbl_cd_reason">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
@@ -77,8 +74,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_1">
@@ -153,13 +148,9 @@
     </child>
   </object>
   <object class="GtkWindow" id="window2">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_2">
-        <property name="width_request">750</property>
-        <property name="height_request">400</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
@@ -236,8 +227,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window3">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_3">
@@ -246,7 +235,6 @@
         <property name="border_width">10</property>
         <child>
           <object class="GtkLabel" id="lbl_analyze_log">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
@@ -284,8 +272,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window4">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_4">
@@ -294,7 +280,6 @@
         <property name="border_width">10</property>
         <child>
           <object class="GtkLabel" id="lbl_page3">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
@@ -368,8 +353,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window5">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <property name="tooltip_text" translatable="yes">Use this button to generate more informative backtrace after you installed additional debug packages</property>
     <child>
@@ -379,7 +362,6 @@
         <property name="border_width">10</property>
         <child>
           <object class="GtkLabel" id="lbl_page4">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
@@ -569,8 +551,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window6">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_6">
@@ -579,7 +559,6 @@
         <property name="border_width">10</property>
         <child>
           <object class="GtkLabel" id="lbl_page6">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
@@ -683,8 +662,6 @@
     </child>
   </object>
   <object class="GtkWindow" id="window7">
-    <property name="width_request">800</property>
-    <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkVBox" id="page_7">
@@ -693,7 +670,6 @@
         <property name="border_width">10</property>
         <child>
           <object class="GtkLabel" id="lbl_report_log">
-            <property name="width_request">750</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
diff --git a/src/lib/event_xml_parser.c b/src/lib/event_xml_parser.c
index 3e7faaf3..32605e70 100644
--- a/src/lib/event_xml_parser.c
+++ b/src/lib/event_xml_parser.c
@@ -32,11 +32,10 @@ struct my_parse_data
 {
     event_config_t *event_config;
     event_option_t *cur_option;
+    const char *cur_locale;
+    char *attribute_lang;
 };
 
-static char *elem_lang;
-static char *locale;
-
 static const char *const option_types[] =
 {
     "text",
@@ -46,36 +45,41 @@ static const char *const option_types[] =
     NULL
 };
 
-static char * get_element_lang(const gchar **att_names, const gchar **att_values)
+// Return xml:lang value for <foo xml:lang="value"> if value matches current locale,
+// "" if foo has no xml:lang attribute at all,
+// else (if xml:lang is for some other locale) return NULL
+//
+static char *get_element_lang(struct my_parse_data *parse_data, const gchar **att_names, const gchar **att_values)
 {
-    char * short_locale_end = strchr(locale, '_');
-    VERB2 log("locale: %s", locale);
+    char *short_locale_end = strchr(parse_data->cur_locale, '_');
+    VERB2 log("locale: %s", parse_data->cur_locale);
     int i;
     for (i = 0; att_names[i] != NULL; ++i)
     {
         VERB2 log("attr: %s:%s", att_names[i], att_values[i]);
         if (strcmp(att_names[i], "xml:lang") == 0)
         {
-            if (strcmp(att_values[i], locale) == 0)
+            if (strcmp(att_values[i], parse_data->cur_locale) == 0)
             {
-                VERB2 log("found translation for: %s", locale);
+                VERB2 log("found translation for: %s", parse_data->cur_locale);
                 return xstrdup(att_values[i]);
             }
 
             /* try to match shorter locale
              * e.g: "cs" with cs_CZ
             */
-            if (strncmp(att_values[i], locale, short_locale_end-locale) == 0)
-            {
-                VERB2 log("found translation for shortlocale: %s", locale);
-                return xstrndup(att_values[i], short_locale_end-locale);
+            if (short_locale_end
+             && strncmp(att_values[i], parse_data->cur_locale, short_locale_end - parse_data->cur_locale) == 0
+            ) {
+                VERB2 log("found translation for shortlocale: %s", parse_data->cur_locale);
+                return xstrndup(att_values[i], short_locale_end - parse_data->cur_locale);
             }
         }
     }
     /* if the element has no attribute then it's a default non-localized value */
     if (i == 0)
-        return xstrdup("C");
-    /* if the element is in different language then the current locale */
+        return xstrdup("");
+    /* if the element is in different language than the current locale */
     return NULL;
 }
 
@@ -126,7 +130,7 @@ static void consume_cur_option(struct my_parse_data *parse_data)
     }
 }
 
-// Called for open tags <foo bar="baz">
+// Called for opening tags <foo bar="baz">
 static void start_element(GMarkupParseContext *context,
                   const gchar *element_name,
                   const gchar **attribute_names,
@@ -170,13 +174,14 @@ static void start_element(GMarkupParseContext *context,
     }
     else if (strcmp(element_name, LABEL_ELEMENT) == 0)
     {
-        elem_lang = get_element_lang(attribute_names, attribute_values);
+        free(parse_data->attribute_lang);
+        parse_data->attribute_lang = get_element_lang(parse_data, attribute_names, attribute_values);
     }
     else if (strcmp(element_name, DESCRIPTION_ELEMENT) == 0)
     {
-        elem_lang = get_element_lang(attribute_names, attribute_values);
+        free(parse_data->attribute_lang);
+        parse_data->attribute_lang = get_element_lang(parse_data, attribute_names, attribute_values);
     }
-
 }
 
 // Called for close tags </foo>
@@ -187,11 +192,8 @@ static void end_element(GMarkupParseContext *context,
 {
     struct my_parse_data *parse_data = user_data;
 
-    if (elem_lang != NULL)
-    {
-        free(elem_lang);
-        elem_lang = NULL;
-    }
+    free(parse_data->attribute_lang);
+    parse_data->attribute_lang = NULL;
 
     if (strcmp(element_name, OPTION_ELEMENT) == 0)
     {
@@ -222,24 +224,26 @@ static void text(GMarkupParseContext *context,
         if (strcmp(inner_element, LABEL_ELEMENT) == 0)
         {
             VERB2 log("new label:'%s'", text_copy);
-            /* set the value only if we found a value for the current locale (elem_lang != "C")
-             * OR
-             * the label is still NULL and we found the default "C" value
-            */
-            if (elem_lang != NULL && ((strcmp(elem_lang, "C") != 0)
-            || (opt->label == NULL && (strcmp(elem_lang, "C") == 0))))
+            if (parse_data->attribute_lang != NULL) /* if it isn't for other locale */
             {
-                free(opt->label);
-                opt->label = text_copy;
+                /* set the value only if we found a value for the current locale
+                 * OR the label is still not set and we found the default value
+                 */
+                if (parse_data->attribute_lang[0] != '\0'
+                 || !opt->label /* && parse_data->attribute_lang is "" - always true */
+                ) {
+                    free(opt->label);
+                    opt->label = text_copy;
+                }
             }
             return;
         }
         /*
-        * we can add a separate filed for the default value
-        * in that case we can implement features like "reset to default value"
-        * but for now using "value" should be enough and clients doesn't
-        * have to know about the "defaul-value"
-        */
+         * we can add a separate field for the default value
+         * in that case we can implement features like "reset to default value"
+         * but for now using "value" should be enough and clients doesn't
+         * have to know about the "defaul-value"
+         */
         if (strcmp(inner_element, DEFAULT_VALUE_ELEMENT) == 0)
         {
             VERB2 log("default value:'%s'", text_copy);
@@ -286,11 +290,18 @@ static void text(GMarkupParseContext *context,
         if (strcmp(inner_element, DESCRIPTION_ELEMENT) == 0)
         {
             VERB2 log("event description:'%s'", text_copy);
-            if (elem_lang != NULL && ((strcmp(elem_lang, "C") != 0)
-            || (ui->description == NULL && (strcmp(elem_lang, "C") == 0))))
+
+            if (parse_data->attribute_lang != NULL) /* if it isn't for other locale */
             {
-                free(ui->description);
-                ui->description = text_copy;
+                /* set the value only if we found a value for the current locale
+                 * OR the description is still not set and we found the default value
+                 */
+                if (parse_data->attribute_lang[0] != '\0'
+                 || !ui->description /* && parse_data->attribute_lang is "" - always true */
+                ) {
+                    free(ui->description);
+                    ui->description = text_copy;
+                }
             }
             return;
         }
@@ -329,8 +340,9 @@ static void error(GMarkupParseContext *context,
 
 void load_event_description_from_file(event_config_t *event_config, const char* filename)
 {
-    struct my_parse_data parse_data = { event_config, NULL };
-    locale = setlocale(LC_ALL, "");
+    struct my_parse_data parse_data = { event_config, NULL, NULL , NULL };
+    parse_data.cur_locale = setlocale(LC_ALL, NULL);
+
     GMarkupParser parser;
     memset(&parser, 0, sizeof(parser)); /* just in case */
     parser.start_element = &start_element;
@@ -358,4 +370,5 @@ void load_event_description_from_file(event_config_t *event_config, const char*
     g_markup_parse_context_free(context);
 
     consume_cur_option(&parse_data); /* just in case */
+    free(parse_data.attribute_lang); /* just in case */
 }