← Back to branch summary

~ubuntu-branches/debian/squeeze/glib2.0/squeeze

« back to all changes in this revision

Viewing changes to glib/goption.c

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-02-15 13:00:43 UTC
  • mfrom: (1.3.1 upstream) (69.1.10 intrepid)
  • Revision ID: james.westby@ubuntu.com-20090215130043-q47fbt3owmt42m2f
Tags: 2.18.4-2
* Release to unstable
* debian/rules:
- bump SHVER, since we are already forcing a 2.18.0 dependecy on the
  symbols introduced in the development versions
* debian/control.in:
- added Homepage and Vcs-* control fields

Show diffs side-by-side

added added

removed removed

Lines of Context:
glib/goption.c
1303
1303
          strcmp (arg, group->entries[j].long_name) == 0)
1304
1304
        {
1305
1305
          gchar *option_name;
 
1306
          gboolean retval;
1306
1307
 
1307
1308
          option_name = g_strconcat ("--", group->entries[j].long_name, NULL);
1308
 
          parse_arg (context, group, &group->entries[j],
1309
 
                     NULL, option_name, error);
 
1309
          retval = parse_arg (context, group, &group->entries[j],
 
1310
                              NULL, option_name, error);
1310
1311
          g_free(option_name);
1311
1312
          
1312
1313
          add_pending_null (context, &((*argv)[*index]), NULL);
1313
1314
          *parsed = TRUE;
 
1315
 
 
1316
          return retval;
1314
1317
        }
1315
1318
      else
1316
1319
        {
2005
2008
 * Associates a function with @group which will be called 
2006
2009
 * from g_option_context_parse() when an error occurs.
2007
2010
 *
2008
 
 * Note that the user data to be passed to @pre_parse_func and
2009
 
 * @post_parse_func can be specified when constructing the group
2010
 
 * with g_option_group_new().
 
2011
 * Note that the user data to be passed to @error_func can be
 
2012
 * specified when constructing the group with g_option_group_new().
2011
2013
 *
2012
2014
 * Since: 2.6
2013
2015
 **/
2054
2056
  group->translate_notify = destroy_notify;
2055
2057
}
2056
2058
 
2057
 
static gchar *
 
2059
static const gchar *
2058
2060
dgettext_swapped (const gchar *msgid, 
2059
2061
                  const gchar *domainname)
2060
2062
{
2061
 
  return dgettext (domainname, msgid);
 
2063
  return g_dgettext (domainname, msgid);
2062
2064
}
2063
2065
 
2064
2066
/**