diff options
author | Murray Cumming <murrayc@src.gnome.org> | 2005-07-31 13:11:05 +0000 |
---|---|---|
committer | Murray Cumming <murrayc@src.gnome.org> | 2005-07-31 13:11:05 +0000 |
commit | 882095551bb8269a9459b5b7e6ecd17f259fd50f (patch) | |
tree | 31d846c5c99a1317001fc09c9675739b59d7b2ff | |
parent | 48b1a7a48d36016bb25453bef10de23b7d7815a0 (diff) | |
download | glibmm-882095551bb8269a9459b5b7e6ecd17f259fd50f.tar.gz |
Stuff I forgot to commit.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | glib/glibmm/miscutils.cc | 13 | ||||
-rw-r--r-- | glib/src/glib_enums.defs | 101 | ||||
-rw-r--r-- | glib/src/optionentry.hg | 6 |
6 files changed, 119 insertions, 26 deletions
@@ -1,3 +1,17 @@ +2.7.2: + +2005-07-16 Murray Cumming <murrayc@murrayc.com + + * glib/glibmm/miscutils.cc: Reimplemented build_filename() and + build_path() with the new non-vararg functions in glib 2.7, + instead of implementing them in gtkmm. + * glib/src/glib_enums.defs: Regenerated with enums.pl + * glib/src/optionentry.hg: Added FLAG_NO_ARG, FLAG_FILENAME, + FLAG_OPTIONAL_ARG, and FLAG_NOALIAS enum values. + + +2.7.1: + 2005-06-08 Murray Cumming <murrayc@murrayc.com * glib/glibmm/propertyproxy.h: @@ -1,3 +1,10 @@ +2.7.2: + +* OptionEntry: Added FLAG_NO_ARG, FLAG_FILENAME, + FLAG_OPTIONAL_ARG, and FLAG_NOALIAS enum values. +* build_filename() and build_path(): Now use the implementation + from glib. + 2.7.1: * GModule: Add BIND_LOCAL enum value. diff --git a/configure.in b/configure.in index c2c1df8e..fb582f1f 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_PREREQ(2.50) ######################################################################### GLIBMM_MAJOR_VERSION=2 GLIBMM_MINOR_VERSION=7 -GLIBMM_MICRO_VERSION=1 +GLIBMM_MICRO_VERSION=2 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION) @@ -38,7 +38,7 @@ AC_SUBST(GLIBMM_RELEASE) # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LIBGLIBMM_SO_VERSION=1:13:0 +LIBGLIBMM_SO_VERSION=1:14:0 AC_SUBST(LIBGLIBMM_SO_VERSION) AC_CONFIG_AUX_DIR(scripts) diff --git a/glib/glibmm/miscutils.cc b/glib/glibmm/miscutils.cc index 752e5c84..5deb832c 100644 --- a/glib/glibmm/miscutils.cc +++ b/glib/glibmm/miscutils.cc @@ -145,21 +145,25 @@ std::string path_get_dirname(const std::string& filename) std::string build_filename(const Glib::ArrayHandle<std::string>& elements) { - return build_path(G_DIR_SEPARATOR_S, elements); + return Glib::convert_return_gchar_ptr_to_stdstring( g_build_filenamev(const_cast<char**>(elements.data())) ); + } std::string build_filename(const std::string& elem1, const std::string& elem2) { const char *const elements[] = { elem1.c_str(), elem2.c_str(), 0 }; - return build_path(G_DIR_SEPARATOR_S, elements); + return build_filename(elements); } +std::string build_path(const std::string& separator, const Glib::ArrayHandle<std::string>& elements) +{ + return Glib::convert_return_gchar_ptr_to_stdstring( g_build_pathv(separator.c_str(), const_cast<char**>(elements.data())) ); + /* Yes, this reimplements the functionality of g_build_path() -- because * it takes a varargs list, and calling it several times would result * in different behaviour. */ -std::string build_path(const std::string& separator, const Glib::ArrayHandle<std::string>& elements) -{ + /* std::string result; result.reserve(256); //TODO: Explain why this magic number is useful. murrayc @@ -230,6 +234,7 @@ std::string build_path(const std::string& separator, const Glib::ArrayHandle<std result += last_trailing; return result; + */ } std::string find_program_in_path(const std::string& program) diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs index ee876709..0df4dde9 100644 --- a/glib/src/glib_enums.defs +++ b/glib/src/glib_enums.defs @@ -1,4 +1,4 @@ -;; From /home/murrayc/cvs/gnome210/glib/glib/gbsearcharray.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gbsearcharray.h (define-flags-extended BSearchArrayFlags (in-module "G") @@ -9,7 +9,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gconvert.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gconvert.h (define-enum-extended ConvertError (in-module "G") @@ -24,7 +24,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gdate.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gdate.h (define-enum-extended DateDMY (in-module "G") @@ -71,7 +71,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gdebug.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gdebug.h (define-flags-extended DebugFlag (in-module "G") @@ -81,7 +81,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gfileutils.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gfileutils.h (define-enum-extended FileError (in-module "G") @@ -127,7 +127,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/ghook.h +;; From /home/murrayc/cvs/gnome212/glib/glib/ghook.h (define-flags-extended HookFlagMask (in-module "G") @@ -139,7 +139,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/giochannel.h +;; From /home/murrayc/cvs/gnome212/glib/glib/giochannel.h (define-enum-extended IOError (in-module "G") @@ -210,7 +210,32 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gmarkup.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gkeyfile.h + +(define-enum-extended KeyFileError + (in-module "G") + (c-name "GKeyFileError") + (values + '("unknown-encoding" "G_KEY_FILE_ERROR_UNKNOWN_ENCODING" "0") + '("parse" "G_KEY_FILE_ERROR_PARSE" "1") + '("not-found" "G_KEY_FILE_ERROR_NOT_FOUND" "2") + '("key-not-found" "G_KEY_FILE_ERROR_KEY_NOT_FOUND" "3") + '("group-not-found" "G_KEY_FILE_ERROR_GROUP_NOT_FOUND" "4") + '("invalid-value" "G_KEY_FILE_ERROR_INVALID_VALUE" "5") + ) +) + +(define-flags-extended KeyFileFlags + (in-module "G") + (c-name "GKeyFileFlags") + (values + '("none" "G_KEY_FILE_NONE" "0") + '("keep-comments" "G_KEY_FILE_KEEP_COMMENTS" "1 << 0") + '("keep-translations" "G_KEY_FILE_KEEP_TRANSLATIONS" "1 << 1") + ) +) + +;; From /home/murrayc/cvs/gnome212/glib/glib/gmarkup.h (define-enum-extended MarkupError (in-module "G") @@ -233,7 +258,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gmessages.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gmessages.h (define-flags-extended LogLevelFlags (in-module "G") @@ -251,16 +276,18 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gnode.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gnode.h (define-flags-extended TraverseFlags (in-module "G") (c-name "GTraverseFlags") (values - '("leafs" "G_TRAVERSE_LEAFS" "1 << 0") - '("non-leafs" "G_TRAVERSE_NON_LEAFS" "1 << 1") + '("leaves" "G_TRAVERSE_LEAVES" "1 << 0") + '("non-leaves" "G_TRAVERSE_NON_LEAVES" "1 << 1") '("all" "G_TRAVERSE_ALL" "0x1") '("mask" "G_TRAVERSE_MASK" "0x03") + '("leafs" "G_TRAVERSE_LEAFS" "0x1") + '("non-leafs" "G_TRAVERSE_NON_LEAFS" "0x2") ) ) @@ -275,7 +302,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/goption.h +;; From /home/murrayc/cvs/gnome212/glib/glib/goption.h (define-flags-extended OptionFlags (in-module "G") @@ -283,6 +310,11 @@ (values '("hidden" "G_OPTION_FLAG_HIDDEN" "1 << 0") '("in-main" "G_OPTION_FLAG_IN_MAIN" "1 << 1") + '("reverse" "G_OPTION_FLAG_REVERSE" "1 << 2") + '("no-arg" "G_OPTION_FLAG_NO_ARG" "1 << 3") + '("filename" "G_OPTION_FLAG_FILENAME" "1 << 4") + '("optional-arg" "G_OPTION_FLAG_OPTIONAL_ARG" "1 << 5") + '("noalias" "G_OPTION_FLAG_NOALIAS" "1 << 6") ) ) @@ -310,7 +342,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gscanner.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gscanner.h (define-enum-extended ErrorType (in-module "G") @@ -327,7 +359,38 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gshell.h +(define-enum-extended TokenType + (in-module "G") + (c-name "GTokenType") + (values + '("eof" "G_TOKEN_EOF" "0") + '("left-paren" "G_TOKEN_LEFT_PAREN" "'('") + '("right-paren" "G_TOKEN_RIGHT_PAREN" "')'") + '("left-curly" "G_TOKEN_LEFT_CURLY" "'{'") + '("right-curly" "G_TOKEN_RIGHT_CURLY" "']'") + '("left-brace" "G_TOKEN_LEFT_BRACE" "'['") + '("right-brace" "G_TOKEN_RIGHT_BRACE" "']'") + '("equal-sign" "G_TOKEN_EQUAL_SIGN" "'='") + '("comma" "G_TOKEN_COMMA" "','") + '("none" "G_TOKEN_NONE" "256") + '("error" "G_TOKEN_ERROR" "257") + '("char" "G_TOKEN_CHAR" "258") + '("binary" "G_TOKEN_BINARY" "259") + '("octal" "G_TOKEN_OCTAL" "260") + '("int" "G_TOKEN_INT" "261") + '("hex" "G_TOKEN_HEX" "262") + '("float" "G_TOKEN_FLOAT" "263") + '("string" "G_TOKEN_STRING" "264") + '("symbol" "G_TOKEN_SYMBOL" "265") + '("identifier" "G_TOKEN_IDENTIFIER" "266") + '("identifier-null" "G_TOKEN_IDENTIFIER_NULL" "267") + '("comment-single" "G_TOKEN_COMMENT_SINGLE" "268") + '("comment-multi" "G_TOKEN_COMMENT_MULTI" "269") + '("last" "G_TOKEN_LAST" "270") + ) +) + +;; From /home/murrayc/cvs/gnome212/glib/glib/gshell.h (define-enum-extended ShellError (in-module "G") @@ -339,7 +402,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gspawn.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gspawn.h (define-enum-extended SpawnError (in-module "G") @@ -381,7 +444,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gstrfuncs.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gstrfuncs.h (define-flags-extended AsciiType (in-module "G") @@ -401,7 +464,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gthread.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gthread.h (define-enum-extended ThreadError (in-module "G") @@ -432,7 +495,7 @@ ) ) -;; From /home/murrayc/cvs/gnome210/glib/glib/gunicode.h +;; From /home/murrayc/cvs/gnome212/glib/glib/gunicode.h (define-enum-extended UnicodeType (in-module "G") diff --git a/glib/src/optionentry.hg b/glib/src/optionentry.hg index 96d798a2..8a34ea18 100644 --- a/glib/src/optionentry.hg +++ b/glib/src/optionentry.hg @@ -52,7 +52,11 @@ public: { FLAG_HIDDEN = 1 << 0, FLAG_IN_MAIN = 1 << 1, - FLAG_REVERSE = 1 << 2 + FLAG_REVERSE = 1 << 2, + FLAG_NO_ARG = 1 << 3, + FLAG_FILENAME = 1 << 4, + FLAG_OPTIONAL_ARG = 1 << 5, + FLAG_NOALIAS = 1 << 6 } GOptionFlags; OptionEntry(); |