Commit c43b74d7 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Bump version to 0.8. (PKG_CHECK_MODULES): Require gconfmm-2.6 >= 2.6.1.

* configure.ac (AC_INIT): Bump version to 0.8.
(PKG_CHECK_MODULES): Require gconfmm-2.6 >= 2.6.1.
(REGEXXER_GCONFMM_VALUE_HACK): Remove.

* src/miscutils.{cc,h}
(check_for_broken_gconfmm_value_changed): Remove.
(has_broken_gconfmm_value_changed): Remove.

* src/main.cc (main): Remove call to gconfmm bug runtime test.

* src/filebuffer.cc (on_config_value_changed): Remove hack.
* src/filetree.cc (on_config_value_changed): ditto
* src/mainwindow.cc (on_config_value_changed): ditto.
* src/prefdialog.{cc,h} (on_config_value_changed_hack): Remove.
parent 63ebb3e2
2004-05-17 Daniel Elstner <daniel.elstner@gmx.net>
* configure.ac (AC_INIT): Bump version to 0.8.
(PKG_CHECK_MODULES): Require gconfmm-2.6 >= 2.6.1.
(REGEXXER_GCONFMM_VALUE_HACK): Remove.
* src/miscutils.{cc,h}
(check_for_broken_gconfmm_value_changed): Remove.
(has_broken_gconfmm_value_changed): Remove.
* src/main.cc (main): Remove call to gconfmm bug runtime test.
* src/filebuffer.cc (on_config_value_changed): Remove hack.
* src/filetree.cc (on_config_value_changed): ditto
* src/mainwindow.cc (on_config_value_changed): ditto.
* src/prefdialog.{cc,h} (on_config_value_changed_hack): Remove.
2004-05-16 Daniel Elstner <daniel.elstner@gmx.net>
* src/mainwindow.cc (on_select_folder): Use Gtk::FileChooserDialog
......
......@@ -18,7 +18,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
AC_INIT([regexxer], [0.7], [daniel.elstner@gmx.net], [regexxer])
AC_INIT([regexxer], [0.8], [daniel.elstner@gmx.net], [regexxer])
AC_PREREQ([2.53])
AC_REVISION([$Revision$])
......@@ -32,7 +32,7 @@ AC_PROG_CXX()
AM_GNU_GETTEXT([external])
PKG_CHECK_MODULES([PKG], [gtkmm-2.4 >= 2.4.0 libglademm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0])
PKG_CHECK_MODULES([PKG], [gtkmm-2.4 >= 2.4.0 libglademm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.1])
AC_SUBST([PKG_CFLAGS])
AC_SUBST([PKG_LIBS])
......@@ -48,27 +48,6 @@ AC_SUBST([REGEXXER_GCONF_DIRECTORY], ['/apps/regexxer'])
REGEXXER_CXX_HAS_STD_LOCALE()
REGEXXER_ARG_ENABLE_WARNINGS()
## This is a really, really nasty thing to do, but...
##
AC_DEFINE([REGEXXER_ENABLE_GCONFMM_VALUE_HACK], [1], [Define to 1 if this nasty hack is necessary.])
AH_BOTTOM(
[
#if REGEXXER_ENABLE_GCONFMM_VALUE_HACK
/*
* Hardcore HACK: Perform the copy which is missing in gconfmm
* five minutes after twelve.
*/
namespace Util { bool has_broken_gconfmm_value_changed(); }
# define REGEXXER_GCONFMM_VALUE_HACK(value) \
if (Util::has_broken_gconfmm_value_changed()) \
new(const_cast<Gnome::Conf::Value*>(&value)) \
Gnome::Conf::Value(const_cast<GConfValue*>(value.gobj()), true)
#else
# define REGEXXER_GCONFMM_VALUE_HACK(value) (void)0
#endif
])
AC_CONFIG_FILES([
Makefile
pixmaps/Makefile
......
......@@ -90,8 +90,6 @@ void RegexxerTags::on_conf_value_changed(const Glib::ustring& key, const Gnome::
{
using namespace Regexxer;
REGEXXER_GCONFMM_VALUE_HACK(value);
if (value.get_type() == Gnome::Conf::VALUE_STRING)
{
if (key.raw() == conf_key_match_color)
......
......@@ -1015,8 +1015,6 @@ void FileTree::load_file_with_fallback(const Gtk::TreeModel::iterator& iter,
void FileTree::on_conf_value_changed(const Glib::ustring& key, const Gnome::Conf::Value& value)
{
REGEXXER_GCONFMM_VALUE_HACK(value);
if (value.get_type() == Gnome::Conf::VALUE_STRING)
{
if (key.raw() == conf_key_fallback_encoding)
......
......@@ -182,9 +182,6 @@ int main(int argc, char** argv)
register_stock_items();
set_default_window_icon();
#if REGEXXER_ENABLE_GCONFMM_VALUE_HACK
Util::check_for_broken_gconfmm_value_changed();
#endif
Regexxer::MainWindow window;
initialize_configuration();
......
......@@ -798,8 +798,6 @@ void MainWindow::on_conf_value_changed(const Glib::ustring& key, const Gnome::Co
{
using namespace Gtk;
REGEXXER_GCONFMM_VALUE_HACK(value);
if (value.get_type() == Gnome::Conf::VALUE_STRING)
{
if (key.raw() == conf_key_textview_font)
......
......@@ -19,50 +19,4 @@
*/
#include "miscutils.h"
#include "signalutils.h"
#include <glib-object.h>
#include <gconf/gconf-value.h>
#include <gconfmm.h>
#include <config.h>
#if REGEXXER_ENABLE_GCONFMM_VALUE_HACK
namespace
{
const void* received_value_pointer = 0;
bool broken_value_changed = false;
void value_changed_handler(const Glib::ustring&, const Gnome::Conf::Value& value)
{
received_value_pointer = value.gobj();
}
} // anonymous namespace
void Util::check_for_broken_gconfmm_value_changed()
{
const Glib::RefPtr<Gnome::Conf::Client> client = Gnome::Conf::Client::get_default_client();
Util::AutoConnection connection (client->signal_value_changed().connect(&value_changed_handler));
GConfValue* value = gconf_value_new(GCONF_VALUE_INT);
gconf_value_set_int(value, 0);
g_signal_emit_by_name(client->gobj(), "value_changed", "dummy_key", value);
broken_value_changed = (received_value_pointer == value);
if (!broken_value_changed)
gconf_value_free(value);
}
bool Util::has_broken_gconfmm_value_changed()
{
return broken_value_changed;
}
#endif /* REGEXXER_ENABLE_GCONFMM_VALUE_HACK */
......@@ -49,10 +49,6 @@ inline Iterator next(Iterator pos) { return ++pos; }
template <class Iterator>
inline Iterator prior(Iterator pos) { return --pos; }
void check_for_broken_gconfmm_value_changed();
bool has_broken_gconfmm_value_changed();
} // namespace Util
#endif /* REGEXXER_MISCUTILS_H_INCLUDED */
......
......@@ -394,13 +394,6 @@ void PrefDialog::on_response(int)
dialog_->hide();
}
void PrefDialog::on_conf_value_changed_hack(const Glib::ustring& key,
const Gnome::Conf::Value& value)
{
REGEXXER_GCONFMM_VALUE_HACK(value);
on_conf_value_changed(key, value);
}
/*
* Note that it isn't strictly required to block the change notifications
* as done below for the "toolbar_style" and "override_direction" settings.
......@@ -459,7 +452,7 @@ void PrefDialog::initialize_configuration()
}
client->signal_value_changed().connect(
sigc::mem_fun(*this, &PrefDialog::on_conf_value_changed_hack));
sigc::mem_fun(*this, &PrefDialog::on_conf_value_changed));
}
void PrefDialog::on_textview_font_selected()
......
......@@ -71,7 +71,6 @@ private:
void on_response(int response_id);
void on_conf_value_changed_hack(const Glib::ustring& key, const Gnome::Conf::Value& value);
void on_conf_value_changed(const Glib::ustring& key, const Gnome::Conf::Value& value);
void initialize_configuration();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment