iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove whats left of gconf

Browse Source
This commit is contained in:
TingPing 2013-09-26 03:06:01 -04:00
parent d18a95fda6
commit 6f013e807c
3 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure.ac
View File

@ -41,7 +41,6 @@ AH_VERBATIM([HEXCHATSHAREDIR],[#undef HEXCHATSHAREDIR])
AH_VERBATIM([SOCKS],[#undef SOCKS]) AH_VERBATIM([SOCKS],[#undef SOCKS])
AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY]) AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY]) AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY])
dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME])
AH_VERBATIM([USE_SHM],[#undef USE_SHM]) AH_VERBATIM([USE_SHM],[#undef USE_SHM])
AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL]) AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY]) AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
@ -108,10 +107,6 @@ AC_ARG_ENABLE(textfe,
[AS_HELP_STRING([--enable-textfe],[build the text frontend (default: no)])], [AS_HELP_STRING([--enable-textfe],[build the text frontend (default: no)])],
textfe=$enableval, textfe=no) textfe=$enableval, textfe=no)
dnl AC_ARG_ENABLE(gnome,
dnl [AS_HELP_STRING([--disable-gnome],[disable use of gnome])],
dnl gnome=$enableval, gnome=yes)
AC_ARG_ENABLE(xlib, AC_ARG_ENABLE(xlib,
[AS_HELP_STRING([--disable-xlib],[disable use of xlib (for non X11 systems)])], [AS_HELP_STRING([--disable-xlib],[disable use of xlib (for non X11 systems)])],
xlib=$enableval, xlib=yes) xlib=$enableval, xlib=yes)
@ -232,39 +227,9 @@ if test "$gtkfe" = yes ; then
fi fi
fi fi
if test "$gtkfe" != yes; then
gnome=no
fi
dnl *********************************************************************
dnl ** GNOME ************************************************************
dnl *********************************************************************
GUI_LIBS="$GUI_LIBS $GTK_LIBS" GUI_LIBS="$GUI_LIBS $GTK_LIBS"
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
#if test "$gnome" = yes; then
# AC_MSG_CHECKING(Gnome2 compile flags)
# GNOME_CFLAGS="`$PKG_CONFIG libgnome-2.0 --cflags 2>/dev/null`"
# if test "_$GNOME_CFLAGS" = _ ; then
# gnome=no
# AC_MSG_RESULT([Gnome not found, building without it.])
# else
# GNOME_VER="`$PKG_CONFIG libgnome-2.0 --modversion`"
# GUI_LIBS="$GUI_LIBS `$PKG_CONFIG libgnome-2.0 --libs`"
# GUI_CFLAGS="$GUI_CFLAGS $GNOME_CFLAGS"
# AC_DEFINE(USE_GNOME)
# AC_MSG_RESULT(ok)
# fi
#fi
# GConf
#if test "$gnome" != no ; then
# AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
#else
# GCONFTOOL=no
#fi
dnl ********************************************************************* dnl *********************************************************************
dnl ** XFT ************************************************************** dnl ** XFT **************************************************************
dnl ********************************************************************* dnl *********************************************************************
@ -683,7 +648,6 @@ AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes") AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes") AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
#AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno") AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
dnl ********************************************************************* dnl *********************************************************************

15
src/common/dbus/Makefile.am
View File

@ -7,7 +7,6 @@ libhexchatdbus_a_SOURCES = \
EXTRA_DIST = \ EXTRA_DIST = \
remote-object.xml \ remote-object.xml \
apps_hexchat_url_handler.schemas \
marshallers.list \ marshallers.list \
example.py \ example.py \
org.hexchat.service.service.in \ org.hexchat.service.service.in \
@ -40,17 +39,3 @@ service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
#if DO_GCONF
#GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source`
#GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
#schemadir = $(GCONF_SCHEMA_FILE_DIR)
#schema_DATA = apps_hexchat_url_handler.schemas
#install-data-local:
# if test -z "$(DESTDIR)" ; then \
# for p in $(schema_DATA) ; do \
# GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
# done \
# fi
#else
install-data-local:
#endif

37
src/common/dbus/apps_hexchat_url_handler.schemas
View File

@ -1,37 +0,0 @@
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/desktop/gnome/url-handlers/irc/command</key>
<applyto>/desktop/gnome/url-handlers/irc/command</applyto>
<owner>hexchat</owner>
<type>string</type>
<default>hexchat --existing --url=%u</default>
<locale name="C">
<short>The handler for "irc://" URLs</short>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>
<applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>
<owner>hexchat</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Set it at TRUE if you want it activated</short>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>
<owner>hexchat</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Run hexchat in a terminal?</short>
</locale>
</schema>
</schemalist>
</gconfschemafile>