gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Migrate to GSettings

master-1.22
Marcel Dijkstra 2013-01-17 20:51:56 +01:00 committed by Stefano Karapetsas
parent 7d6b297873
commit 46c4c36e0a
21 changed files with 1348 additions and 1988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caja/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = \ libcaja_open_terminal_la_CFLAGS = \
-DG_LOG_DOMAIN=\"Caja-Open-Terminal\" \ -DG_LOG_DOMAIN=\"Caja-Open-Terminal\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
@ -7,8 +7,8 @@ INCLUDES = \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
-Werror \ -Werror \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \
$(CAJA_CFLAGS) \ $(AM_CFLAGS) \
$(MATECONF_CFLAGS) \ $(TERM_CFLAGS) \
$(MATEDESKTOP_CFLAGS) $(MATEDESKTOP_CFLAGS)
caja_extensiondir=$(CAJA_EXTENSION_DIR) caja_extensiondir=$(CAJA_EXTENSION_DIR)
@ -24,4 +24,4 @@ libcaja_open_terminal_la_SOURCES = \
open-terminal.c open-terminal.c
libcaja_open_terminal_la_LDFLAGS = -module -avoid-version libcaja_open_terminal_la_LDFLAGS = -module -avoid-version
libcaja_open_terminal_la_LIBADD = $(CAJA_LIBS) $(MATECONF_LIBS) $(MATEDESKTOP_LIBS) libcaja_open_terminal_la_LIBADD = $(AM_LIBS) $(TERM_LIBS) $(MATEDESKTOP_LIBS)

39
caja/caja-open-terminal.c
View File

@ -34,8 +34,6 @@
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <mateconf/mateconf.h>
#include <mateconf/mateconf-client.h>
#include <libmate/mate-desktop-item.h> #include <libmate/mate-desktop-item.h>
#include <errno.h> #include <errno.h>
@ -89,30 +87,26 @@ get_terminal_file_info (const char *uri)
return ret; return ret;
} }
static MateConfClient *mateconf_client = NULL; static GSettings *settings_open = NULL;
static GSettings *settings_preferences = NULL;
static GSettings *settings_lockdown = NULL;
static inline gboolean static inline gboolean
desktop_opens_home_dir (void) desktop_opens_home_dir (void)
{ {
return mateconf_client_get_bool (mateconf_client, return g_settings_get_boolean (settings_open, "desktop-opens-home-dir");
"/apps/caja-open-terminal/desktop_opens_home_dir",
NULL);
} }
static inline gboolean static inline gboolean
display_mc_item (void) display_mc_item (void)
{ {
return mateconf_client_get_bool (mateconf_client, return g_settings_get_boolean (settings_open, "display-mc-items");
"/apps/caja-open-terminal/display_mc_item",
NULL);
} }
static inline gboolean static inline gboolean
desktop_is_home_dir () desktop_is_home_dir ()
{ {
return mateconf_client_get_bool (mateconf_client, return g_settings_get_boolean (settings_preferences, "desktop-is-home-dir");
"/apps/caja/preferences/desktop_is_home_dir",
NULL);
} }
/* a very simple URI parsing routine from Launchpad #333462, until GLib supports URI parsing (MATE #489862) */ /* a very simple URI parsing routine from Launchpad #333462, until GLib supports URI parsing (MATE #489862) */
@ -461,9 +455,7 @@ open_terminal_menu_item_new (cajaFileInfo *file_info,
static gboolean static gboolean
terminal_locked_down (void) terminal_locked_down (void)
{ {
return mateconf_client_get_bool (mateconf_client, return g_settings_get_boolean (settings_lockdown, "disable-command-line");
"/desktop/mate/lockdown/disable_command_line",
NULL);
} }
/* used to determine for remote URIs whether GVFS is capable of mapping them to ~/.gvfs */ /* used to determine for remote URIs whether GVFS is capable of mapping them to ~/.gvfs */
@ -613,16 +605,23 @@ caja_open_terminal_instance_init (CajaOpenTerminal *cvs)
static void static void
caja_open_terminal_class_init (CajaOpenTerminalClass *class) caja_open_terminal_class_init (CajaOpenTerminalClass *class)
{ {
g_assert (mateconf_client == NULL); g_assert (settings_open == NULL);
mateconf_client = mateconf_client_get_default (); settings_open = g_settings_new ("org.mate.caja-open-terminal");
g_assert (settings_preferences == NULL);
settings_preferences = g_settings_new ("org.mate.caja.preferences");
g_assert (settings_lockdown == NULL);
settings_lockdown = g_settings_new ("org.mate.lockdown");
} }
static void static void
caja_open_terminal_class_finalize (CajaOpenTerminalClass *class) caja_open_terminal_class_finalize (CajaOpenTerminalClass *class)
{ {
g_assert (mateconf_client != NULL); g_assert (settings_open != NULL);
g_object_unref (mateconf_client); g_object_unref (settings_open);
mateconf_client = NULL; g_assert (settings_preferences != NULL);
g_object_unref (settings_preferences);
g_assert (settings_lockdown != NULL);
g_object_unref (settings_lockdown);
} }
GType GType

6
caja/open-terminal.c
View File

@ -27,7 +27,6 @@
#include "caja-open-terminal.h" #include "caja-open-terminal.h"
#include <mateconf/mateconf-client.h>
#include <libintl.h> #include <libintl.h>
static GType type_list[1]; static GType type_list[1];
@ -42,11 +41,6 @@ caja_module_initialize (GTypeModule *module)
bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
mateconf_client_add_dir(mateconf_client_get_default(),
"/desktop/mate/lockdown",
0,
NULL);
} }
void void

21
configure.ac
View File

@ -39,11 +39,11 @@ MATE_COMPILE_WARNINGS([maximum])
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
DCONF_NEW_REQUIRED=0.13
DCONF_OLD_REQUIRED=0.10
GLIB_REQUIRED=2.25.0 GLIB_REQUIRED=2.25.0
GIO_REQUIRED=2.25.12 GIO_REQUIRED=2.25.12
GTK_REQUIRED=2.14.0 GTK_REQUIRED=2.14.0
#MATECONF_REQUIRED=2.31.3 just testing
MATECONF_REQUIRED=1.1.0
VTE_REQUIRED=0.25.91 VTE_REQUIRED=0.25.91
AC_MSG_CHECKING([which gtk+ version to compile against]) AC_MSG_CHECKING([which gtk+ version to compile against])
@ -80,7 +80,6 @@ PKG_CHECK_MODULES([TERM],
gthread-2.0 gthread-2.0
gio-2.0 >= $GIO_REQUIRED gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
mateconf-2.0 >= $MATECONF_REQUIRED
$PLATFORM_DEPS]) $PLATFORM_DEPS])
# ******** # ********
@ -115,16 +114,20 @@ AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"]) AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
# ***** # *****
# MateConf # GSettings
# ***** # *****
AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no) GLIB_GSETTINGS
if test x"$MATECONFTOOL" = xno; then PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED],
AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf]) [AC_DEFINE([HAVE_DCONF_NEW], [1], [Use DCONF >= 0.13])],
fi [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED],
[AC_DEFINE([HAVE_DCONF_OLD], [1], [Use DCONF 0.12])
])
])
AC_SUBST(DCONF_CFLAGS)
AC_SUBST(DCONF_LIBS)
AM_MATECONF_SOURCE_2
GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)" GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)"
AC_SUBST([GLIB_GENMARSHAL]) AC_SUBST([GLIB_GENMARSHAL])

23
src/Makefile.am
View File

@ -23,10 +23,14 @@ mate_terminal_SOURCES= \
terminal-accels.h \ terminal-accels.h \
terminal-app.c \ terminal-app.c \
terminal-app.h \ terminal-app.h \
terminal-dconf.c \
terminal-dconf.h \
terminal-debug.c \ terminal-debug.c \
terminal-debug.h \ terminal-debug.h \
terminal-encoding.c \ terminal-encoding.c \
terminal-encoding.h \ terminal-encoding.h \
terminal-gsettings.c \
terminal-gsettings.h \
terminal-info-bar.c \ terminal-info-bar.c \
terminal-info-bar.h \ terminal-info-bar.h \
terminal-intl.h \ terminal-intl.h \
@ -76,17 +80,20 @@ mate_terminal_CPPFLAGS = \
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_SINGLE_INCLUDES \ -DGTK_DISABLE_SINGLE_INCLUDES \
$(DISABLE_DEPRECATED) \ $(DISABLE_DEPRECATED) \
$(DCONF_CFLAGS) \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
mate_terminal_CFLAGS = \ mate_terminal_CFLAGS = \
$(TERM_CFLAGS) \ $(TERM_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(DCONF_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
mate_terminal_LDFLAGS = -lICE mate_terminal_LDFLAGS = -lICE
mate_terminal_LDADD = \ mate_terminal_LDADD = \
skey/libskey.la \ skey/libskey.la \
$(DCONF_LIBS) \
$(TERM_LIBS) $(TERM_LIBS)
if WITH_SMCLIENT if WITH_SMCLIENT
@ -147,9 +154,10 @@ terminal-marshal.c: $(srcdir)/terminal-marshal.list
&& mv terminal-marshal.c.tmp terminal-marshal.c ) \ && mv terminal-marshal.c.tmp terminal-marshal.c ) \
|| ( rm -f terminal-marshal.c.tmp && exit 1 ) || ( rm -f terminal-marshal.c.tmp && exit 1 )
schemadir = $(MATECONF_SCHEMA_FILE_DIR) gsettingsschema_in_files = org.mate.terminal.gschema.xml.in
schema_in_files = mate-terminal.schemas.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
schema_DATA = mate-terminal.schemas .PRECIOUS: $(gsettings_SCHEMAS)
@INTLTOOL_XML_NOMERGE_RULE@
aboutdir = $(pkgdatadir) aboutdir = $(pkgdatadir)
about_DATA = \ about_DATA = \
@ -177,6 +185,7 @@ builder_DATA = $(builder_in_files:.glade=.ui)
CLEANFILES = \ CLEANFILES = \
stamp-terminal-type-builtins.h \ stamp-terminal-type-builtins.h \
mate-terminal.schemas \ mate-terminal.schemas \
$(gsettings_SCHEMAS) \
stamp-terminal-type-builtins.h \ stamp-terminal-type-builtins.h \
$(builder_DATA) \ $(builder_DATA) \
$(BUILT_SOURCES) $(BUILT_SOURCES)
@ -188,16 +197,14 @@ EXTRA_DIST = \
extra-strings.c \ extra-strings.c \
$(about_DATA) \ $(about_DATA) \
$(schema_in_files) \ $(schema_in_files) \
$(gsettingsschema_in_files) \
$(uimanager_DATA) \ $(uimanager_DATA) \
$(builder_in_files) \ $(builder_in_files) \
$(NULL) $(NULL)
@INTLTOOL_SCHEMAS_RULE@ @GSETTINGS_RULES@
if MATECONF_SCHEMAS_INSTALL @INTLTOOL_SCHEMAS_RULE@
install-data-local:
MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/src/$(schema_DATA)
endif
%.ui: %.glade %.ui: %.glade
$(AM_V_GEN) $(GTK_BUILDER_CONVERT) $< $@ $(AM_V_GEN) $(GTK_BUILDER_CONVERT) $< $@

1302
src/mate-terminal.schemas.in
View File

File diff suppressed because it is too large Load Diff

444
src/org.mate.terminal.gschema.xml.in 100644
View File

@ -0,0 +1,444 @@
<?xml version="1.0"?>
<schemalist gettext-domain="mate-terminal">
<enum id="org.mate.terminal.erasebinding">
<value nick="auto" value="0"/>
<value nick="control-h" value="1"/>
<value nick="ascii-del" value="2"/>
<value nick="escape-sequence" value="3"/>
<value nick="tty" value="4"/>
</enum>
<enum id="org.mate.terminal.titlemode">
<value nick="replace" value="0"/>
<value nick="before" value="1"/>
<value nick="after" value="2"/>
<value nick="ignore" value="3"/>
</enum>
<enum id="org.mate.terminal.scrollbar-position">
<value nick="left" value="0"/>
<value nick="right" value="1"/>
<value nick="hidden" value="2"/>
</enum>
<enum id="org.mate.terminal.exit-action">
<value nick="close" value="0"/>
<value nick="restart" value="1"/>
<value nick="hold" value="2"/>
</enum>
<enum id="org.mate.terminal.cursor-shape">
<value nick="block" value="0"/>
<value nick="ibeam" value="1"/>
<value nick="underline" value="2"/>
</enum>
<enum id="org.mate.terminal.cursor-blink-mode">
<value nick="system" value="0"/>
<value nick="on" value="1"/>
<value nick="off" value="2"/>
</enum>
<enum id="org.mate.terminal.background-type">
<value nick="solid" value="0"/>
<value nick="image" value="1"/>
<value nick="transparent" value="2"/>
</enum>
<schema id="org.mate.terminal" path="/org/mate/terminal/">
<child name="global" schema="org.mate.terminal.global"/>
<child name="profiles" schema="org.mate.terminal.profiles"/>
<child name="keybindings" schema="org.mate.terminal.keybindings"/>
</schema>
<schema id="org.mate.terminal.global" path="/org/mate/terminal/global/">
<key name="profile-list" type="as">
<default>[ 'default' ]</default>
<summary>List of profiles</summary>
<description>List of profiles known to mate-terminal. The list contains strings naming subdirectories relative to /org/mate/terminal/profiles.</description>
</key>
<key name="default-profile" type="s">
<default>'default'</default>
<summary>Profile to use for new terminals</summary>
<description>Profile to be used when opening a new window or tab. Must be in profile_list.</description>
</key>
<key name="use-mnemonics" type="b">
<default>true</default>
<summary>Whether the menubar has access keys</summary>
<description>Whether to have Alt+letter access keys for the menubar. They may interfere with some applications run inside the terminal so it's possible to turn them off.</description>
</key>
<key name="use-menu-accelerators" type="b">
<default>true</default>
<summary>Whether the standard GTK shortcut for menubar access is enabled</summary>
<description>Normally you can access the menubar with F10. This can also be customized via gtkrc (gtk-menu-bar-accel = "whatever"). This option allows the standard menubar accelerator to be disabled.</description>
</key>
<key name="active-encodings" type="as">
<default context="active-encodings" l10n="messages">[ 'UTF-8', 'current' ]</default>
<summary>List of available encodings</summary>
<description>A subset of possible encodings are presented in the Encoding submenu. This is a list of encodings to appear there. The special encoding name "current" means to display the encoding of the current locale.</description>
</key>
<key name="confirm-window-close" type="b">
<default>true</default>
<summary>Whether to ask for confirmation when closing terminal windows</summary>
<description>Whether to ask for confirmation when closing a terminal window which has more than one open tab.</description>
</key>
</schema>
<schema id="org.mate.terminal.profiles" path="/org/mate/terminal/profiles/">
</schema>
<schema id="org.mate.terminal.profile">
<key name="visible-name" type="s">
<default context="visible-name" l10n="messages">'Default'</default>
<summary>Human-readable name of the profile</summary>
<description>Human-readable name of the profile.</description>
</key>
<key name="default-show-menubar" type="b">
<default>true</default>
<summary>Whether to show menubar in new windows/tabs</summary>
<description>True if the menubar should be shown in new windows, for windows/tabs with this profile.</description>
</key>
<key name="foreground-color" type="s">
<default>'#000000'</default>
<summary>Default color of text in the terminal</summary>
<description>Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
</key>
<key name="background-color" type="s">
<default>'#FFFFDD'</default>
<summary>Default color of terminal background</summary>
<description>Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
</key>
<key name="bold-color" type="s">
<default>'#000000'</default>
<summary>Default color of bold text in the terminal</summary>
<description>Default color of bold text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if bold_color_same_as_fg is true.</description>
</key>
<key name="bold-color-same-as-fg" type="b">
<default>true</default>
<summary>Whether bold text should use the same color as normal text</summary>
<description>If true, boldface text will be rendered using the same color as normal text.</description>
</key>
<key name="title-mode" enum="org.mate.terminal.titlemode">
<default>'replace'</default>
<summary>What to do with dynamic title</summary>
<description>If the application in the terminal sets the title (most typically people have their shell set up to do this), the dynamically-set title can erase the configured title, go before it, go after it, or replace it. The possible values are "replace", "before", "after", and "ignore".</description>
</key>
<key name="title" type="s">
<default context="title" l10n="messages">'Terminal'</default>
<summary>Title for terminal</summary>
<description>Title to display for the terminal window or tab. This title may be replaced by or combined with the title set by the application inside the terminal, depending on the title_mode setting.</description>
</key>
<key name="allow-bold" type="b">
<default>true</default>
<summary>Whether to allow bold text</summary>
<description>If true, allow applications in the terminal to make text boldface.</description>
</key>
<key name="silent-bell" type="b">
<default>false</default>
<summary>Whether to silence terminal bell</summary>
<description>If true, don't make a noise when applications send the escape sequence for the terminal bell.</description>
</key>
<key name="word-chars" type="s">
<default>'-A-Za-z0-9,./?%&amp;#:_=+@~'</default>
<summary>Characters that are considered "part of a word"</summary>
<description>When selecting text by word, sequences of these characters are considered single words. Ranges can be given as "A-Z". Literal hyphen (not expressing a range) should be the first character given.</description>
</key>
<key name="use-custom-default-size" type="b">
<default>false</default>
<summary>Whether to use custom terminal size for new windows</summary>
<description>If true, newly created terminal windows will have custom size specified by default_size_columns and default_size_rows.</description>
</key>
<key name="default-size-columns" type="i">
<default>80</default>
<summary>Default number of columns</summary>
<description>Number of columns in newly created terminal windows. Has no effect if use_custom_default_size is not enabled.</description>
</key>
<key name="default-size-rows" type="i">
<default>24</default>
<summary>Default number of rows</summary>
<description>Number of rows in newly created terminal windows. Has no effect if use_custom_default_size is not enabled.</description>
</key>
<key name="scrollbar-position" enum="org.mate.terminal.scrollbar-position">
<default>'right'</default>
<summary>Position of the scrollbar</summary>
<description>Where to put the terminal scrollbar. Possibilities are "left", "right", and "hidden".</description>
</key>
<key name="scrollback-lines" type="i">
<default>512</default>
<summary>Number of lines to keep in scrollback</summary>
<description>Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this value is ignored.</description>
</key>
<key name="scrollback-unlimited" type="b">
<default>false</default>
<summary>Whether an unlimited number of lines should be kept in scrollback</summary>
<description>If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal.</description>
</key>
<key name="scroll-on-keystroke" type="b">
<default>true</default>
<summary>Whether to scroll to the bottom when a key is pressed</summary>
<description>If true, pressing a key jumps the scrollbar to the bottom.</description>
</key>
<key name="scroll-on-output" type="b">
<default>false</default>
<summary>Whether to scroll to the bottom when there's new output</summary>
<description>If true, whenever there's new output the terminal will scroll to the bottom.</description>
</key>
<key name="exit-action" enum="org.mate.terminal.exit-action">
<default>'close'</default>
<summary>What to do with the terminal when the child command exits</summary>
<description>Possible values are "close" to close the terminal, and "restart" to restart the command.</description>
</key>
<key name="login-shell" type="b">
<default>false</default>
<summary>Whether to launch the command in the terminal as a login shell</summary>
<description>If true, the command inside the terminal will be launched as a login shell. (argv[0] will have a hyphen in front of it.)</description>
</key>
<key name="update-records" type="b">
<default>true</default>
<summary>Whether to update login records when launching terminal command</summary>
<description>If true, the system login records utmp and wtmp will be updated when the command inside the terminal is launched.</description>
</key>
<key name="use-custom-command" type="b">
<default>false</default>
<summary>Whether to run a custom command instead of the shell</summary>
<description>If true, the value of the custom_command setting will be used in place of running a shell.</description>
</key>
<key name="cursor-blink-mode" enum="org.mate.terminal.cursor-blink-mode">
<default>'system'</default>
<summary>Whether to blink the cursor</summary>
<description>The possible values are "system" to use the global cursor blinking settings, or "on" or "off" to set the mode explicitly.</description>
</key>
<key name="cursor-shape" enum="org.mate.terminal.cursor-shape">
<default>'block'</default>
<summary>The cursor appearance</summary>
<description>The possible values are "block" to use a block cursor, "ibeam" to use a vertical line cursor, or "underline" to use an underline cursor.</description>
</key>
<key name="custom-command" type="s">
<default>''</default>
<summary>Custom command to use instead of the shell</summary>
<description>Run this command in place of the shell, if use_custom_command is true.</description>
</key>
<key name="icon" type="s">
<default>''</default>
<summary>Icon for terminal window</summary>
<description>Icon to use for tabs/windows containing this profile.</description>
</key>
<key name="palette" type="s">
<default>'#2E2E34343636:#CCCC00000000:#4E4E9A9A0606:#C4C4A0A00000:#34346565A4A4:#757550507B7B:#060698209A9A:#D3D3D7D7CFCF:#555557575353:#EFEF29292929:#8A8AE2E23434:#FCFCE9E94F4F:#72729F9FCFCF:#ADAD7F7FA8A8:#3434E2E2E2E2:#EEEEEEEEECEC'</default>
<summary>Palette for terminal applications</summary>
<description>Terminals have a 16-color palette that applications inside the terminal can use. This is that palette, in the form of a colon-separated list of color names. Color names should be in hex format e.g. "#FF00FF"</description>
</key>
<key name="font" type="s">
<default>'Monospace 12'</default>
<summary>Font</summary>
<description>An Pango font name. Examples are "Sans 12" or "Monospace Bold 14".</description>
</key>
<key name="background-type" enum="org.mate.terminal.background-type">
<default>'solid'</default>
<summary>Background type</summary>
<description>Type of terminal background. May be "solid" for a solid color, "image" for an image, or "transparent" for either real transparency if a compositing window manager is running, or pseudo-transparency otherwise.</description>
</key>
<key name="background-image" type="s">
<default>''</default>
<summary>Background image</summary>
<description>Filename of a background image.</description>
</key>
<key name="scroll-background" type="b">
<default>true</default>
<summary>Whether to scroll background image</summary>
<description>If true, scroll the background image with the foreground text; if false, keep the image in a fixed position and scroll the text above it.</description>
</key>
<key name="background-darkness" type="d">
<default>0.5</default>
<summary>How much to darken the background image</summary>
<description>A value between 0.0 and 1.0 indicating how much to darken the background image. 0.0 means no darkness, 1.0 means fully dark. In the current implementation, there are only two levels of darkness possible, so the setting behaves as a boolean, where 0.0 disables the darkening effect.</description>
</key>
<key name="backspace-binding" enum="org.mate.terminal.erasebinding">
<default>'ascii-del'</default>
<summary>Effect of the Backspace key</summary>
<description>Sets what code the backspace key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "ascii-del" is normally considered the correct setting for the Backspace key.</description>
</key>
<key name="delete-binding" enum="org.mate.terminal.erasebinding">
<default>'escape-sequence'</default>
<summary>Effect of the Delete key</summary>
<description>Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key.</description>
</key>
<key name="use-theme-colors" type="b">
<default>true</default>
<summary>Whether to use the colors from the theme for the terminal widget</summary>
<description>If true, the theme color scheme used for text entry boxes will be used for the terminal, instead of colors provided by the user.</description>
</key>
<key name="use-system-font" type="b">
<default>true</default>
<summary>Whether to use the system font</summary>
<description>If true, the terminal will use the desktop-global standard font if it's monospace (and the most similar font it can come up with otherwise).</description>
</key>
<key name="use-skey" type="b">
<default>true</default>
<summary>Highlight S/Key challenges</summary>
<description>Popup a dialog when an S/Key challenge response query is detected and clicked on. Typing a password into the dialog will send it to the terminal.</description>
</key>
</schema>
<schema id="org.mate.terminal.keybindings" path="/org/mate/terminal/keybindings/">
<key name="new-tab" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;t'</default>
<summary>Keyboard shortcut to open a new tab</summary>
<description>Keyboard shortcut key for opening a new tab. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="new-window" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;n'</default>
<summary>Keyboard shortcut to open a new window</summary>
<description>Keyboard shortcut key for opening a new window. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="new-profile" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to create a new profile</summary>
<description>Keyboard shortcut key for bringing up the dialog for profile creation. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="save-contents" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to save the current tab contents to file</summary>
<description>Keyboard shortcut key to save the current tab contents to a file. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="close-tab" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;w'</default>
<summary>Keyboard shortcut to close a tab</summary>
<description>Keyboard shortcut key for closing a tab. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="close-window" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;q'</default>
<summary>Keyboard shortcut to close a window</summary>
<description>Keyboard shortcut key for closing a window. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="copy" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;c'</default>
<summary>Keyboard shortcut to copy text</summary>
<description>Keyboard shortcut key for copying selected text to the clipboard. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="paste" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;v'</default>
<summary>Keyboard shortcut to paste text</summary>
<description>Keyboard shortcut key for pasting the contents of the clipboard into the terminal. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="full-screen" type="s">
<default>'F11'</default>
<summary>Keyboard shortcut to toggle full screen mode</summary>
<description>Keyboard shortcut key for toggling full screen mode. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="toggle-menubar" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to toggle the visibility of the menubar</summary>
<description>Keyboard shortcut key to toggle the visibility of the menubar. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="set-terminal-title" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to set the terminal title</summary>
<description>Keyboard shortcut key to set the terminal title. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="reset" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to reset the terminal</summary>
<description>Keyboard shortcut key to reset the terminal. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="reset-and-clear" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to reset and clear the terminal</summary>
<description>Keyboard shortcut key to reset and clear the terminal. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="prev-tab" type="s">
<default>'&lt;Control&gt;Page_Up'</default>
<summary>Keyboard shortcut to switch to the previous tab</summary>
<description>Keyboard shortcut key to switch to the previous tab. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="next-tab" type="s">
<default>'&lt;Control&gt;Page_Down'</default>
<summary>Keyboard shortcut to switch to the next tab</summary>
<description>Keyboard shortcut key to switch to the next tab. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="move-tab-left" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;Page_Up'</default>
<summary>Accelerator to move the current tab to the left.</summary>
<description>Accelerator key to move the current tab to the left. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
<key name="move-tab-right" type="s">
<default>'&lt;Ctrl&gt;&lt;Shift&gt;Page_Down'</default>
<summary>Accelerator to move the current tab to the right.</summary>
<description>Accelerator key to move the current tab to the right. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
<key name="detach-tab" type="s">
<default>'disabled'</default>
<summary>Accelerator to detach current tab.</summary>
<description>Accelerator key to detach current tab. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
<key name="switch-to-tab-1" type="s">
<default>'&lt;Alt&gt;1'</default>
<summary>Keyboard shortcut to switch to tab 1</summary>
<description>Keyboard shortcut key for switch to tab 1. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-2" type="s">
<default>'&lt;Alt&gt;2'</default>
<summary>Keyboard shortcut to switch to tab 2</summary>
<description>Keyboard shortcut key for switch to tab 2. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-3" type="s">
<default>'&lt;Alt&gt;3'</default>
<summary>Keyboard shortcut to switch to tab 3</summary>
<description>Keyboard shortcut key for switch to tab 3. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-4" type="s">
<default>'&lt;Alt&gt;4'</default>
<summary>Keyboard shortcut to switch to tab 4</summary>
<description>Keyboard shortcut key for switch to tab 4. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-5" type="s">
<default>'&lt;Alt&gt;5'</default>
<summary>Keyboard shortcut to switch to tab 5</summary>
<description>Keyboard shortcut key for switch to tab 5. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-6" type="s">
<default>'&lt;Alt&gt;6'</default>
<summary>Keyboard shortcut to switch to tab 6</summary>
<description>Keyboard shortcut key for switch to tab 6. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-7" type="s">
<default>'&lt;Alt&gt;7'</default>
<summary>Keyboard shortcut to switch to tab 7</summary>
<description>Keyboard shortcut key for switch to tab 7. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-8" type="s">
<default>'&lt;Alt&gt;8'</default>
<summary>Keyboard shortcut to switch to tab 8</summary>
<description>Keyboard shortcut key for switch to tab 8. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-9" type="s">
<default>'&lt;Alt&gt;9'</default>
<summary>Keyboard shortcut to switch to tab 9</summary>
<description>Keyboard shortcut key for switch to tab 9. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-10" type="s">
<default>'&lt;Alt&gt;0'</default>
<summary>Keyboard shortcut to switch to tab 10</summary>
<description>Keyboard shortcut key for switch to tab 10. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-11" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to switch to tab 11</summary>
<description>Keyboard shortcut key for switch to tab 11. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="switch-to-tab-12" type="s">
<default>'disabled'</default>
<summary>Keyboard shortcut to switch to tab 12</summary>
<description>Keyboard shortcut key for switch to tab 12. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="help" type="s">
<default>'F1'</default>
<summary>Keyboard shortcut to launch help</summary>
<description>Keyboard shortcut key for launching help. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="zoom-in" type="s">
<default>'&lt;Ctrl&gt;plus'</default>
<summary>Keyboard shortcut to make font larger</summary>
<description>Keyboard shortcut key for making font larger. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="zoom-out" type="s">
<default>'&lt;Ctrl&gt;minus'</default>
<summary>Keyboard shortcut to make font smaller</summary>
<description>Keyboard shortcut key for making font smaller. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
<key name="zoom-normal" type="s">
<default>'&lt;Ctrl&gt;0'</default>
<summary>Keyboard shortcut to make font normal-size</summary>
<description>Keyboard shortcut key for making font the normal size. Expressed as a string in the same format used for GTK+ resource files. If you set the option to the special string "disabled", then there will be no keyboard shortcut for this action.</description>
</key>
</schema>
</schemalist>

260
src/terminal-accels.c
View File

@ -31,18 +31,18 @@
/* NOTES /* NOTES
* *
* There are two sources of keybindings changes, from MateConf and from * There are two sources of keybindings changes, from GSettings and from
* the accel map (happens with in-place menu editing). * the accel map (happens with in-place menu editing).
* *
* When a keybinding mateconf key changes, we propagate that into the * When a keybinding GSettins key changes, we propagate that into the
* accel map. * accel map.
* When the accel map changes, we queue a sync to mateconf. * When the accel map changes, we queue a sync to GSettings.
* *
* To avoid infinite loops, we short-circuit in both directions * To avoid infinite loops, we short-circuit in both directions
* if the value is unchanged from last known. * if the value is unchanged from last known.
* *
* In the keybinding editor, when editing or clearing an accel, we write * In the keybinding editor, when editing or clearing an accel, we write
* the change directly to mateconf and rely on the mateconf callback to * the change directly to GSettings and rely on the GSettings callback to
* actually apply the change to the accel map. * actually apply the change to the accel map.
*/ */
@ -71,29 +71,29 @@
#define ACCEL_PATH_DETACH_TAB ACCEL_PATH_ROOT "TabsDetach" #define ACCEL_PATH_DETACH_TAB ACCEL_PATH_ROOT "TabsDetach"
#define ACCEL_PATH_SWITCH_TAB_PREFIX ACCEL_PATH_ROOT "TabsSwitch" #define ACCEL_PATH_SWITCH_TAB_PREFIX ACCEL_PATH_ROOT "TabsSwitch"
#define KEY_CLOSE_TAB CONF_KEYS_PREFIX "/close_tab" #define KEY_CLOSE_TAB "close-tab"
#define KEY_CLOSE_WINDOW CONF_KEYS_PREFIX "/close_window" #define KEY_CLOSE_WINDOW "close-window"
#define KEY_COPY CONF_KEYS_PREFIX "/copy" #define KEY_COPY "copy"
#define KEY_DETACH_TAB CONF_KEYS_PREFIX "/detach_tab" #define KEY_DETACH_TAB "detach-tab"
#define KEY_FULL_SCREEN CONF_KEYS_PREFIX "/full_screen" #define KEY_FULL_SCREEN "full-screen"
#define KEY_HELP CONF_KEYS_PREFIX "/help" #define KEY_HELP "help"
#define KEY_MOVE_TAB_LEFT CONF_KEYS_PREFIX "/move_tab_left" #define KEY_MOVE_TAB_LEFT "move-tab-left"
#define KEY_MOVE_TAB_RIGHT CONF_KEYS_PREFIX "/move_tab_right" #define KEY_MOVE_TAB_RIGHT "move-tab-right"
#define KEY_NEW_PROFILE CONF_KEYS_PREFIX "/new_profile" #define KEY_NEW_PROFILE "new-profile"
#define KEY_NEW_TAB CONF_KEYS_PREFIX "/new_tab" #define KEY_NEW_TAB "new-tab"
#define KEY_NEW_WINDOW CONF_KEYS_PREFIX "/new_window" #define KEY_NEW_WINDOW "new-window"
#define KEY_NEXT_TAB CONF_KEYS_PREFIX "/next_tab" #define KEY_NEXT_TAB "next-tab"
#define KEY_PASTE CONF_KEYS_PREFIX "/paste" #define KEY_PASTE "paste"
#define KEY_PREV_TAB CONF_KEYS_PREFIX "/prev_tab" #define KEY_PREV_TAB "prev-tab"
#define KEY_RESET_AND_CLEAR CONF_KEYS_PREFIX "/reset_and_clear" #define KEY_RESET_AND_CLEAR "reset-and-clear"
#define KEY_RESET CONF_KEYS_PREFIX "/reset" #define KEY_RESET "reset"
#define KEY_SAVE_CONTENTS CONF_KEYS_PREFIX "/save_contents" #define KEY_SAVE_CONTENTS "save-contents"
#define KEY_SET_TERMINAL_TITLE CONF_KEYS_PREFIX "/set_window_title" #define KEY_SET_TERMINAL_TITLE "set-terminal-title"
#define KEY_TOGGLE_MENUBAR CONF_KEYS_PREFIX "/toggle_menubar" #define KEY_TOGGLE_MENUBAR "toggle-menubar"
#define KEY_ZOOM_IN CONF_KEYS_PREFIX "/zoom_in" #define KEY_ZOOM_IN "zoom-in"
#define KEY_ZOOM_NORMAL CONF_KEYS_PREFIX "/zoom_normal" #define KEY_ZOOM_NORMAL "zoom-normal"
#define KEY_ZOOM_OUT CONF_KEYS_PREFIX "/zoom_out" #define KEY_ZOOM_OUT "zoom-out"
#define KEY_SWITCH_TAB_PREFIX CONF_KEYS_PREFIX "/switch_to_tab_" #define KEY_SWITCH_TAB_PREFIX "switch-to-tab-"
#if 1 #if 1
/* /*
@ -112,14 +112,14 @@
typedef struct typedef struct
{ {
const char *user_visible_name; const char *user_visible_name;
const char *mateconf_key; const char *gsettings_key;
const char *accel_path; const char *accel_path;
/* last values received from mateconf */ /* last values received from GSettings */
GdkModifierType mateconf_mask; GdkModifierType gsettings_mask;
guint mateconf_keyval; guint gsettings_keyval;
GClosure *closure; GClosure *closure;
/* have gotten a notification from gtk */ /* have gotten a notification from gtk */
gboolean needs_mateconf_sync; gboolean needs_gsettings_sync;
gboolean accel_path_unlocked; gboolean accel_path_unlocked;
} KeyEntry; } KeyEntry;
@ -318,10 +318,9 @@ enum
N_COLUMNS N_COLUMNS
}; };
static void keys_change_notify (MateConfClient *client, static void keys_change_notify (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry, gpointer user_data);
gpointer user_data);
static void accel_changed_callback (GtkAccelGroup *accel_group, static void accel_changed_callback (GtkAccelGroup *accel_group,
guint keyval, guint keyval,
@ -333,7 +332,7 @@ static gboolean binding_from_string (const char *str,
guint *accelerator_key, guint *accelerator_key,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);
static gboolean binding_from_value (MateConfValue *value, static gboolean binding_from_value (GVariant *value,
guint *accelerator_key, guint *accelerator_key,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);
@ -341,12 +340,12 @@ static gboolean sync_idle_cb (gpointer data);
static guint sync_idle_id = 0; static guint sync_idle_id = 0;
static GtkAccelGroup *notification_group = NULL; static GtkAccelGroup *notification_group = NULL;
/* never set mateconf keys in response to receiving a mateconf notify. */ /* never set GSettings keys in response to receiving a GSettings notify. */
static int inside_mateconf_notify = 0; static int inside_gsettings_notify = 0;
static GtkWidget *edit_keys_dialog = NULL; static GtkWidget *edit_keys_dialog = NULL;
static GtkTreeStore *edit_keys_store = NULL; static GtkTreeStore *edit_keys_store = NULL;
static guint mateconf_notify_id; static GHashTable *gsettings_key_to_entry;
static GHashTable *mateconf_key_to_entry; static GSettings *settings_keybindings;
static char* static char*
binding_name (guint keyval, binding_name (guint keyval,
@ -368,33 +367,19 @@ binding_display_name (guint keyval,
return g_strdup (_("Disabled")); return g_strdup (_("Disabled"));
} }
static const char *
key_from_mateconf_key (const char *mateconf_key)
{
const char *last_slash = strrchr (mateconf_key, '/');
if (last_slash)
return ++last_slash;
return NULL;
}
void void
terminal_accels_init (void) terminal_accels_init (void)
{ {
MateConfClient *conf;
guint i, j; guint i, j;
conf = mateconf_client_get_default (); settings_keybindings = g_settings_new (CONF_KEYS_SCHEMA);
mateconf_client_add_dir (conf, CONF_KEYS_PREFIX, g_signal_connect (settings_keybindings,
MATECONF_CLIENT_PRELOAD_ONELEVEL, "changed",
NULL); G_CALLBACK(keys_change_notify),
mateconf_notify_id = NULL);
mateconf_client_notify_add (conf,
CONF_KEYS_PREFIX,
keys_change_notify,
NULL, NULL, NULL);
mateconf_key_to_entry = g_hash_table_new (g_str_hash, g_str_equal); gsettings_key_to_entry = g_hash_table_new (g_str_hash, g_str_equal);
notification_group = gtk_accel_group_new (); notification_group = gtk_accel_group_new ();
@ -406,8 +391,8 @@ terminal_accels_init (void)
key_entry = &(all_entries[i].key_entry[j]); key_entry = &(all_entries[i].key_entry[j]);
g_hash_table_insert (mateconf_key_to_entry, g_hash_table_insert (gsettings_key_to_entry,
(gpointer) key_from_mateconf_key (key_entry->mateconf_key), (gpointer) key_entry->gsettings_key,
key_entry); key_entry);
key_entry->closure = g_closure_new_simple (sizeof (GClosure), key_entry); key_entry->closure = g_closure_new_simple (sizeof (GClosure), key_entry);
@ -418,13 +403,10 @@ terminal_accels_init (void)
gtk_accel_group_connect_by_path (notification_group, gtk_accel_group_connect_by_path (notification_group,
I_(key_entry->accel_path), I_(key_entry->accel_path),
key_entry->closure); key_entry->closure);
keys_change_notify (settings_keybindings, key_entry->gsettings_key, NULL);
mateconf_client_notify (conf, key_entry->mateconf_key);
} }
} }
g_object_unref (conf);
g_signal_connect (notification_group, "accel-changed", g_signal_connect (notification_group, "accel-changed",
G_CALLBACK (accel_changed_callback), NULL); G_CALLBACK (accel_changed_callback), NULL);
} }
@ -432,12 +414,11 @@ terminal_accels_init (void)
void void
terminal_accels_shutdown (void) terminal_accels_shutdown (void)
{ {
MateConfClient *conf;
conf = mateconf_client_get_default (); g_signal_handlers_disconnect_by_func (settings_keybindings,
mateconf_client_notify_remove (conf, mateconf_notify_id); G_CALLBACK(keys_change_notify),
mateconf_client_remove_dir (conf, CONF_KEYS_PREFIX, NULL); NULL);
g_object_unref (conf); g_object_unref (settings_keybindings);
if (sync_idle_id != 0) if (sync_idle_id != 0)
{ {
@ -447,8 +428,8 @@ terminal_accels_shutdown (void)
sync_idle_cb (NULL); sync_idle_cb (NULL);
} }
g_hash_table_destroy (mateconf_key_to_entry); g_hash_table_destroy (gsettings_key_to_entry);
mateconf_key_to_entry = NULL; gsettings_key_to_entry = NULL;
g_object_unref (notification_group); g_object_unref (notification_group);
notification_group = NULL; notification_group = NULL;
@ -475,37 +456,36 @@ update_model_foreach (GtkTreeModel *model,
} }
static void static void
keys_change_notify (MateConfClient *client, keys_change_notify (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry, gpointer user_data)
gpointer user_data)
{ {
MateConfValue *val; GVariant *val;
KeyEntry *key_entry; KeyEntry *key_entry;
GdkModifierType mask; GdkModifierType mask;
guint keyval; guint keyval;
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"key %s changed\n", "key %s changed\n",
mateconf_entry_get_key (entry)); key);
val = mateconf_entry_get_value (entry); val = g_settings_get_value (settings, key);
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS) _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS)
{ {
if (val == NULL) if (val == NULL)
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, " changed to be unset\n"); _terminal_debug_print (TERMINAL_DEBUG_ACCELS, " changed to be unset\n");
else if (val->type != MATECONF_VALUE_STRING) else if (!g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, " changed to non-string value\n"); _terminal_debug_print (TERMINAL_DEBUG_ACCELS, " changed to non-string value\n");
else else
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
" changed to \"%s\"\n", " changed to \"%s\"\n",
mateconf_value_get_string (val)); g_variant_get_string (val, NULL));
} }
#endif #endif
key_entry = g_hash_table_lookup (mateconf_key_to_entry, key_from_mateconf_key (mateconf_entry_get_key (entry))); key_entry = g_hash_table_lookup (gsettings_key_to_entry, key);
if (!key_entry) if (!key_entry)
{ {
/* shouldn't really happen, but let's be safe */ /* shouldn't really happen, but let's be safe */
@ -516,15 +496,14 @@ keys_change_notify (MateConfClient *client,
if (!binding_from_value (val, &keyval, &mask)) if (!binding_from_value (val, &keyval, &mask))
{ {
const char *str = val->type == MATECONF_VALUE_STRING ? mateconf_value_get_string (val) : NULL; const char *str = g_variant_is_of_type (val, G_VARIANT_TYPE_STRING) ? g_variant_get_string (val, NULL) : NULL;
g_printerr ("The value \"%s\" of configuration key %s is not a valid accelerator\n", g_printerr ("The value \"%s\" of configuration key %s is not a valid accelerator\n",
str ? str : "(null)", str ? str : "(null)",
key_entry->mateconf_key); key_entry->gsettings_key);
return; return;
} }
key_entry->gsettings_keyval = keyval;
key_entry->mateconf_keyval = keyval; key_entry->gsettings_mask = mask;
key_entry->mateconf_mask = mask;
/* Unlock the path, so we can change its accel */ /* Unlock the path, so we can change its accel */
if (!key_entry->accel_path_unlocked) if (!key_entry->accel_path_unlocked)
@ -535,15 +514,15 @@ keys_change_notify (MateConfClient *client,
"changing path %s to %s\n", "changing path %s to %s\n",
key_entry->accel_path, key_entry->accel_path,
binding_name (keyval, mask)); /* memleak */ binding_name (keyval, mask)); /* memleak */
inside_mateconf_notify += 1; inside_gsettings_notify += 1;
/* Note that this may return FALSE, e.g. when the entry was already set correctly. */ /* Note that this may return FALSE, e.g. when the entry was already set correctly. */
gtk_accel_map_change_entry (key_entry->accel_path, gtk_accel_map_change_entry (key_entry->accel_path,
keyval, mask, keyval, mask,
TRUE); TRUE);
inside_mateconf_notify -= 1; inside_gsettings_notify -= 1;
/* Lock the path if the mateconf key isn't writable */ /* Lock the path if the GSettings key isn't writable */
key_entry->accel_path_unlocked = mateconf_entry_get_is_writable (entry); key_entry->accel_path_unlocked = g_settings_is_writable (settings, key);
if (!key_entry->accel_path_unlocked) if (!key_entry->accel_path_unlocked)
gtk_accel_map_lock_path (key_entry->accel_path); gtk_accel_map_lock_path (key_entry->accel_path);
@ -556,6 +535,8 @@ keys_change_notify (MateConfClient *client,
*/ */
if (edit_keys_store) if (edit_keys_store)
gtk_tree_model_foreach (GTK_TREE_MODEL (edit_keys_store), update_model_foreach, key_entry); gtk_tree_model_foreach (GTK_TREE_MODEL (edit_keys_store), update_model_foreach, key_entry);
g_variant_unref(val);
} }
static void static void
@ -570,7 +551,7 @@ accel_changed_callback (GtkAccelGroup *accel_group,
* accelerator. We just use the accel closure to find our * accelerator. We just use the accel closure to find our
* accel entry, then update the value of that entry. * accel entry, then update the value of that entry.
* We use an idle function to avoid setting the entry * We use an idle function to avoid setting the entry
* in mateconf when the accelerator gets removed and then * in GSettings when the accelerator gets removed and then
* setting it again when it gets added. * setting it again when it gets added.
*/ */
KeyEntry *key_entry; KeyEntry *key_entry;
@ -580,17 +561,17 @@ accel_changed_callback (GtkAccelGroup *accel_group,
binding_name (keyval, modifier), /* memleak */ binding_name (keyval, modifier), /* memleak */
accel_closure); accel_closure);
if (inside_mateconf_notify) if (inside_gsettings_notify)
{ {
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"Ignoring change from gtk because we're inside a mateconf notify\n"); "Ignoring change from gtk because we're inside a GSettings notify\n");
return; return;
} }
key_entry = accel_closure->data; key_entry = accel_closure->data;
g_assert (key_entry); g_assert (key_entry);
key_entry->needs_mateconf_sync = TRUE; key_entry->needs_gsettings_sync = TRUE;
if (sync_idle_id == 0) if (sync_idle_id == 0)
sync_idle_id = g_idle_add (sync_idle_cb, NULL); sync_idle_id = g_idle_add (sync_idle_cb, NULL);
@ -618,7 +599,7 @@ binding_from_string (const char *str,
} }
static gboolean static gboolean
binding_from_value (MateConfValue *value, binding_from_value (GVariant *value,
guint *accelerator_key, guint *accelerator_key,
GdkModifierType *accelerator_mods) GdkModifierType *accelerator_mods)
{ {
@ -630,10 +611,10 @@ binding_from_value (MateConfValue *value,
return TRUE; return TRUE;
} }
if (value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
return FALSE; return FALSE;
return binding_from_string (mateconf_value_get_string (value), return binding_from_string (g_variant_get_string (value,NULL),
accelerator_key, accelerator_key,
accelerator_mods); accelerator_mods);
} }
@ -641,23 +622,23 @@ binding_from_value (MateConfValue *value,
static void static void
add_key_entry_to_changeset (gpointer key, add_key_entry_to_changeset (gpointer key,
KeyEntry *key_entry, KeyEntry *key_entry,
MateConfChangeSet *changeset) GSettings *changeset)
{ {
GtkAccelKey gtk_key; GtkAccelKey gtk_key;
if (!key_entry->needs_mateconf_sync) if (!key_entry->needs_gsettings_sync)
return; return;
key_entry->needs_mateconf_sync = FALSE; key_entry->needs_gsettings_sync = FALSE;
if (gtk_accel_map_lookup_entry (key_entry->accel_path, &gtk_key) && if (gtk_accel_map_lookup_entry (key_entry->accel_path, &gtk_key) &&
(gtk_key.accel_key != key_entry->mateconf_keyval || (gtk_key.accel_key != key_entry->gsettings_keyval ||
gtk_key.accel_mods != key_entry->mateconf_mask)) gtk_key.accel_mods != key_entry->gsettings_mask))
{ {
char *accel_name; char *accel_name;
accel_name = binding_name (gtk_key.accel_key, gtk_key.accel_mods); accel_name = binding_name (gtk_key.accel_key, gtk_key.accel_mods);
mateconf_change_set_set_string (changeset, key_entry->mateconf_key, accel_name); g_settings_set_string (changeset, key_entry->gsettings_key, accel_name);
g_free (accel_name); g_free (accel_name);
} }
} }
@ -665,27 +646,21 @@ add_key_entry_to_changeset (gpointer key,
static gboolean static gboolean
sync_idle_cb (gpointer data) sync_idle_cb (gpointer data)
{ {
MateConfClient *conf; GSettings *changeset;
MateConfChangeSet *changeset;
GError *error = NULL; GError *error = NULL;
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"mateconf sync handler\n"); "GSettings sync handler\n");
sync_idle_id = 0; sync_idle_id = 0;
conf = mateconf_client_get_default (); changeset = g_settings_new (CONF_KEYS_SCHEMA);
g_settings_delay (changeset);
changeset = mateconf_change_set_new (); g_hash_table_foreach (gsettings_key_to_entry, (GHFunc) add_key_entry_to_changeset, changeset);
g_hash_table_foreach (mateconf_key_to_entry, (GHFunc) add_key_entry_to_changeset, changeset); g_settings_apply(changeset);
if (!mateconf_client_commit_change_set (conf, changeset, TRUE, &error))
{
g_printerr ("Error committing the accelerator changeset: %s\n", error->message);
g_error_free (error);
}
mateconf_change_set_unref (changeset); g_object_unref (changeset);
g_object_unref (conf);
return FALSE; return FALSE;
} }
@ -718,8 +693,8 @@ accel_set_func (GtkTreeViewColumn *tree_column,
"visible", TRUE, "visible", TRUE,
"sensitive", ke->accel_path_unlocked, "sensitive", ke->accel_path_unlocked,
"editable", ke->accel_path_unlocked, "editable", ke->accel_path_unlocked,
"accel-key", ke->mateconf_keyval, "accel-key", ke->gsettings_keyval,
"accel-mods", ke->mateconf_mask, "accel-mods", ke->gsettings_mask,
NULL); NULL);
} }
@ -746,8 +721,8 @@ accel_compare_func (GtkTreeModel *model,
} }
else else
{ {
name_a = binding_display_name (ke_a->mateconf_keyval, name_a = binding_display_name (ke_a->gsettings_keyval,
ke_a->mateconf_mask); ke_a->gsettings_mask);
} }
gtk_tree_model_get (model, b, gtk_tree_model_get (model, b,
@ -761,8 +736,8 @@ accel_compare_func (GtkTreeModel *model,
} }
else else
{ {
name_b = binding_display_name (ke_b->mateconf_keyval, name_b = binding_display_name (ke_b->gsettings_keyval,
ke_b->mateconf_mask); ke_b->gsettings_mask);
} }
result = g_utf8_collate (name_a, name_b); result = g_utf8_collate (name_a, name_b);
@ -798,7 +773,6 @@ accel_edited_callback (GtkCellRendererAccel *cell,
GtkAccelGroupEntry *entries; GtkAccelGroupEntry *entries;
guint n_entries; guint n_entries;
char *str; char *str;
MateConfClient *conf;
model = gtk_tree_view_get_model (view); model = gtk_tree_view_get_model (view);
@ -840,7 +814,8 @@ accel_edited_callback (GtkCellRendererAccel *cell,
GTK_BUTTONS_OK, GTK_BUTTONS_OK,
_("The shortcut key “%s” is already bound to the “%s” action"), _("The shortcut key “%s” is already bound to the “%s” action"),
name, name,
other_key->user_visible_name ? _(other_key->user_visible_name) : other_key->mateconf_key);
other_key->user_visible_name ? _(other_key->user_visible_name) : other_key->gsettings_key);
g_free (name); g_free (name);
g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
@ -853,7 +828,7 @@ accel_edited_callback (GtkCellRendererAccel *cell,
str = binding_name (keyval, mask); str = binding_name (keyval, mask);
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"Edited path %s keyval %s, setting mateconf to %s\n", "Edited path %s keyval %s, setting GSettings to %s\n",
ke->accel_path, ke->accel_path,
gdk_keyval_name (keyval) ? gdk_keyval_name (keyval) : "null", gdk_keyval_name (keyval) ? gdk_keyval_name (keyval) : "null",
str); str);
@ -877,12 +852,9 @@ accel_edited_callback (GtkCellRendererAccel *cell,
} }
#endif #endif
conf = mateconf_client_get_default (); g_settings_set_string (settings_keybindings,
mateconf_client_set_string (conf, ke->gsettings_key,
ke->mateconf_key, str);
str,
NULL);
g_object_unref (conf);
g_free (str); g_free (str);
} }
@ -896,7 +868,6 @@ accel_cleared_callback (GtkCellRendererAccel *cell,
GtkTreeIter iter; GtkTreeIter iter;
KeyEntry *ke; KeyEntry *ke;
char *str; char *str;
MateConfClient *conf;
model = gtk_tree_view_get_model (view); model = gtk_tree_view_get_model (view);
@ -917,22 +888,19 @@ accel_cleared_callback (GtkCellRendererAccel *cell,
if (ke == NULL) if (ke == NULL)
return; return;
ke->mateconf_keyval = 0; ke->gsettings_keyval = 0;
ke->mateconf_mask = 0; ke->gsettings_mask = 0;
ke->needs_mateconf_sync = TRUE; ke->needs_gsettings_sync = TRUE;
str = binding_name (0, 0); str = binding_name (0, 0);
_terminal_debug_print (TERMINAL_DEBUG_ACCELS, _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"Cleared keybinding for mateconf %s", "Cleared keybinding for GSettings %s",
ke->mateconf_key); ke->gsettings_key);
conf = mateconf_client_get_default (); g_settings_set_string (settings_keybindings,
mateconf_client_set_string (conf, ke->gsettings_key,
ke->mateconf_key, str);
str,
NULL);
g_object_unref (conf);
g_free (str); g_free (str);
} }

352
src/terminal-app.c
View File

@ -36,7 +36,8 @@
#include "terminal-util.h" #include "terminal-util.h"
#include "profile-editor.h" #include "profile-editor.h"
#include "terminal-encoding.h" #include "terminal-encoding.h"
#include <mateconf/mateconf-client.h> #include "terminal-gsettings.h"
#include "terminal-dconf.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -48,14 +49,14 @@
#endif #endif
#endif #endif
#define FALLBACK_PROFILE_ID "Default" #define FALLBACK_PROFILE_ID "default"
/* Settings storage works as follows: /* Settings storage works as follows:
* /apps/mate-terminal/global/ * /apps/mate-terminal/global/
* /apps/mate-terminal/profiles/Foo/ * /apps/mate-terminal/profiles/Foo/
* *
* It's somewhat tricky to manage the profiles/ dir since we need to track * It's somewhat tricky to manage the profiles/ dir since we need to track
* the list of profiles, but mateconf doesn't have a concept of notifying that * the list of profiles, but GSettings doesn't have a concept of notifying that
* a directory has appeared or disappeared. * a directory has appeared or disappeared.
* *
* Session state is stored entirely in the RestartCommand command line. * Session state is stored entirely in the RestartCommand command line.
@ -65,7 +66,7 @@
* OVERLAP. The UI and implementation totally break if you overlap * OVERLAP. The UI and implementation totally break if you overlap
* these categories. See mate-terminal 1.x for why. * these categories. See mate-terminal 1.x for why.
* *
* Don't use this code as an example of how to use MateConf - it's hugely * Don't use this code as an example of how to use GSettings - it's hugely
* overcomplicated due to the profiles stuff. Most apps should not * overcomplicated due to the profiles stuff. Most apps should not
* have to do scary things of this nature, and should not have * have to do scary things of this nature, and should not have
* a profiles feature. * a profiles feature.
@ -94,13 +95,8 @@ struct _TerminalApp
GtkWidget *manage_profiles_delete_button; GtkWidget *manage_profiles_delete_button;
GtkWidget *manage_profiles_default_menu; GtkWidget *manage_profiles_default_menu;
MateConfClient *conf; GSettings *settings_global;
guint profile_list_notify_id; GSettings *settings_font;
guint default_profile_notify_id;
guint encoding_list_notify_id;
guint system_font_notify_id;
guint enable_mnemonics_notify_id;
guint enable_menu_accels_notify_id;
GHashTable *profiles; GHashTable *profiles;
char* default_profile_id; char* default_profile_id;
@ -148,23 +144,20 @@ enum
static TerminalApp *global_app = NULL; static TerminalApp *global_app = NULL;
/* Evil hack alert: this is exported from libmateconf-2 but not in a public header */ #define MONOSPACE_FONT_SCHEMA "org.mate.interface"
extern gboolean mateconf_spawn_daemon(GError** err); #define MONOSPACE_FONT_KEY "monospace-font-name"
#define MONOSPACE_FONT_DIR "/desktop/mate/interface"
#define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name"
#define DEFAULT_MONOSPACE_FONT ("Monospace 10") #define DEFAULT_MONOSPACE_FONT ("Monospace 10")
#define ENABLE_MNEMONICS_KEY CONF_GLOBAL_PREFIX "/use_mnemonics" #define ENABLE_MNEMONICS_KEY "use-mnemonics"
#define DEFAULT_ENABLE_MNEMONICS (TRUE) #define DEFAULT_ENABLE_MNEMONICS (TRUE)
#define ENABLE_MENU_BAR_ACCEL_KEY CONF_GLOBAL_PREFIX"/use_menu_accelerators" #define ENABLE_MENU_BAR_ACCEL_KEY "use-menu-accelerators"
#define DEFAULT_ENABLE_MENU_BAR_ACCEL (TRUE) #define DEFAULT_ENABLE_MENU_BAR_ACCEL (TRUE)
#define PROFILE_LIST_KEY CONF_GLOBAL_PREFIX "/profile_list" #define PROFILE_LIST_KEY "profile-list"
#define DEFAULT_PROFILE_KEY CONF_GLOBAL_PREFIX "/default_profile" #define DEFAULT_PROFILE_KEY "default-profile"
#define ENCODING_LIST_KEY CONF_GLOBAL_PREFIX "/active_encodings" #define ENCODING_LIST_KEY "active-encodings"
/* Helper functions */ /* Helper functions */
@ -305,43 +298,23 @@ static void
terminal_app_delete_profile (TerminalApp *app, terminal_app_delete_profile (TerminalApp *app,
TerminalProfile *profile) TerminalProfile *profile)
{ {
GHashTableIter iter; const char *profile_name;
GSList *name_list; char *profile_dir;
const char *name, *profile_name;
char *mateconf_dir;
GError *error = NULL; GError *error = NULL;
const char **nameptr = &name;
profile_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_NAME); profile_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_NAME);
mateconf_dir = mateconf_concat_dir_and_key (CONF_PREFIX "/profiles", profile_name); profile_dir = g_strconcat (CONF_PROFILE_PREFIX, profile_name, "/", NULL);
name_list = NULL; terminal_gsettings_remove_all_from_strv (app->settings_global, PROFILE_LIST_KEY, profile_name);
g_hash_table_iter_init (&iter, app->profiles);
while (g_hash_table_iter_next (&iter, (gpointer *) nameptr, NULL))
{
if (strcmp (name, profile_name) == 0)
continue;
name_list = g_slist_prepend (name_list, g_strdup (name));
}
mateconf_client_set_list (app->conf,
CONF_GLOBAL_PREFIX"/profile_list",
MATECONF_VALUE_STRING,
name_list,
NULL);
g_slist_foreach (name_list, (GFunc) g_free, NULL);
g_slist_free (name_list);
/* And remove the profile directory */ /* And remove the profile directory */
if (!mateconf_client_recursive_unset (app->conf, mateconf_dir, MATECONF_UNSET_INCLUDING_SCHEMA_NAMES, &error)) if (!terminal_dconf_recursive_reset (profile_dir, &error))
{ {
g_warning ("Failed to recursively unset %s: %s\n", mateconf_dir, error->message); g_warning ("Failed to recursively unset %s: %s\n", profile_dir, error->message);
g_error_free (error); g_error_free (error);
} }
g_free (mateconf_dir); g_free (profile_dir);
} }
static void static void
@ -510,12 +483,10 @@ profile_combo_box_changed_cb (GtkWidget *widget,
if (!profile) if (!profile)
return; return;
mateconf_client_set_string (app->conf, g_settings_set_string (app->settings_global, DEFAULT_PROFILE_KEY,
CONF_GLOBAL_PREFIX "/default_profile", terminal_profile_get_property_string (profile, TERMINAL_PROFILE_NAME));
terminal_profile_get_property_string (profile, TERMINAL_PROFILE_NAME),
NULL);
/* Even though the mateconf change notification does this, it happens too late. /* Even though the GSettings change notification does this, it happens too late.
* In some cases, the default profile changes twice in quick succession, * In some cases, the default profile changes twice in quick succession,
* and update_default_profile must be called in sync with those changes. * and update_default_profile must be called in sync with those changes.
*/ */
@ -741,14 +712,13 @@ find_profile_link (GList *profiles,
} }
static void static void
terminal_app_profile_list_notify_cb (MateConfClient *conf, terminal_app_profile_list_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry,
gpointer user_data) gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
GObject *object = G_OBJECT (app); GObject *object = G_OBJECT (app);
MateConfValue *val; GVariant *val;
GSList *value_list, *sl; GSList *value_list, *sl;
GList *profiles_to_delete, *l; GList *profiles_to_delete, *l;
gboolean need_new_default; gboolean need_new_default;
@ -759,22 +729,20 @@ terminal_app_profile_list_notify_cb (MateConfClient *conf,
profiles_to_delete = terminal_app_get_profile_list (app); profiles_to_delete = terminal_app_get_profile_list (app);
val = mateconf_entry_get_value (entry); val = g_settings_get_value (settings, key);
if (val == NULL || if (val == NULL ||
val->type != MATECONF_VALUE_LIST || (!g_variant_is_of_type (val, G_VARIANT_TYPE_STRING_ARRAY) &&
mateconf_value_get_list_type (val) != MATECONF_VALUE_STRING) !g_variant_is_of_type (val, G_VARIANT_TYPE_STRING)))
goto ensure_one_profile; goto ensure_one_profile;
value_list = mateconf_value_get_list (val); value_list = terminal_gsettings_strv_to_gslist( g_variant_get_strv (val, NULL));
/* Add any new ones */ /* Add any new ones */
for (sl = value_list; sl != NULL; sl = sl->next) for (sl = value_list; sl != NULL; sl = sl->next)
{ {
MateConfValue *listvalue = (MateConfValue *) (sl->data); const char *profile_name = sl->data;
const char *profile_name;
GList *link; GList *link;
profile_name = mateconf_value_get_string (listvalue);
if (!profile_name) if (!profile_name)
continue; continue;
@ -863,21 +831,20 @@ ensure_one_profile:
} }
static void static void
terminal_app_default_profile_notify_cb (MateConfClient *client, terminal_app_default_profile_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry,
gpointer user_data) gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
MateConfValue *val; GVariant *val;
const char *name = NULL; const char *name = NULL;
app->default_profile_locked = !mateconf_entry_get_is_writable (entry); app->default_profile_locked = !g_settings_is_writable (settings, key);
val = mateconf_entry_get_value (entry); val = g_settings_get_value (settings, key);
if (val != NULL && if (val != NULL &&
val->type == MATECONF_VALUE_STRING) g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
name = mateconf_value_get_string (val); name = g_variant_get_string (val, NULL);
if (!name || !name[0]) if (!name || !name[0])
name = FALLBACK_PROFILE_ID; name = FALLBACK_PROFILE_ID;
g_assert (name != NULL); g_assert (name != NULL);
@ -888,6 +855,7 @@ terminal_app_default_profile_notify_cb (MateConfClient *client,
app->default_profile = terminal_app_get_profile_by_name (app, name); app->default_profile = terminal_app_get_profile_by_name (app, name);
g_object_notify (G_OBJECT (app), TERMINAL_APP_DEFAULT_PROFILE); g_object_notify (G_OBJECT (app), TERMINAL_APP_DEFAULT_PROFILE);
g_variant_unref (val);
} }
static int static int
@ -909,18 +877,17 @@ encoding_mark_active (gpointer key,
} }
static void static void
terminal_app_encoding_list_notify_cb (MateConfClient *client, terminal_app_encoding_list_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry,
gpointer user_data) gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
MateConfValue *val; GVariant *val;
GSList *strings, *tmp; GSList *strings, *tmp;
TerminalEncoding *encoding; TerminalEncoding *encoding;
const char *charset; const char *charset;
app->encodings_locked = !mateconf_entry_get_is_writable (entry); app->encodings_locked = !g_settings_is_writable (settings, key);
/* Mark all as non-active, then re-enable the active ones */ /* Mark all as non-active, then re-enable the active ones */
g_hash_table_foreach (app->encodings, (GHFunc) encoding_mark_active, GUINT_TO_POINTER (FALSE)); g_hash_table_foreach (app->encodings, (GHFunc) encoding_mark_active, GUINT_TO_POINTER (FALSE));
@ -937,19 +904,16 @@ terminal_app_encoding_list_notify_cb (MateConfClient *client,
if (terminal_encoding_is_valid (encoding)) if (terminal_encoding_is_valid (encoding))
encoding->is_active = TRUE; encoding->is_active = TRUE;
val = mateconf_entry_get_value (entry); val = g_settings_get_value (settings, key);
if (val != NULL && if (val != NULL &&
val->type == MATECONF_VALUE_LIST && g_variant_is_of_type (val, G_VARIANT_TYPE_STRING_ARRAY))
mateconf_value_get_list_type (val) == MATECONF_VALUE_STRING) strings = terminal_gsettings_strv_to_gslist (g_variant_get_strv (val, NULL));
strings = mateconf_value_get_list (val);
else else
strings = NULL; strings = NULL;
for (tmp = strings; tmp != NULL; tmp = tmp->next) for (tmp = strings; tmp != NULL; tmp = tmp->next)
{ {
MateConfValue *v = (MateConfValue *) tmp->data; charset = tmp->data;
charset = mateconf_value_get_string (v);
if (!charset) if (!charset)
continue; continue;
@ -961,26 +925,27 @@ terminal_app_encoding_list_notify_cb (MateConfClient *client,
} }
g_signal_emit (app, signals[ENCODING_LIST_CHANGED], 0); g_signal_emit (app, signals[ENCODING_LIST_CHANGED], 0);
g_variant_unref (val);
g_slist_free_full (strings, g_free);
} }
static void static void
terminal_app_system_font_notify_cb (MateConfClient *client, terminal_app_system_font_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry,
gpointer user_data) gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
MateConfValue *mateconf_value; GVariant *val;
const char *font = NULL; const char *font = NULL;
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
if (strcmp (mateconf_entry_get_key (entry), MONOSPACE_FONT_KEY) != 0) if (strcmp (key, MONOSPACE_FONT_KEY) != 0)
return; return;
mateconf_value = mateconf_entry_get_value (entry); val = g_settings_get_value (settings, key);
if (mateconf_value && if (val &&
mateconf_value->type == MATECONF_VALUE_STRING) g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
font = mateconf_value_get_string (mateconf_value); font = g_variant_get_string (val, NULL);
if (!font) if (!font)
font = DEFAULT_MONOSPACE_FONT; font = DEFAULT_MONOSPACE_FONT;
g_assert (font != NULL); g_assert (font != NULL);
@ -999,28 +964,19 @@ terminal_app_system_font_notify_cb (MateConfClient *client,
app->system_font_desc = font_desc; app->system_font_desc = font_desc;
g_object_notify (G_OBJECT (app), TERMINAL_APP_SYSTEM_FONT); g_object_notify (G_OBJECT (app), TERMINAL_APP_SYSTEM_FONT);
g_variant_unref (val);
} }
static void static void
terminal_app_enable_mnemonics_notify_cb (MateConfClient *client, terminal_app_enable_mnemonics_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry, gpointer user_data)
gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
MateConfValue *mateconf_value; GVariant *settings_value;
gboolean enable; gboolean enable;
if (strcmp (mateconf_entry_get_key (entry), ENABLE_MNEMONICS_KEY) != 0) enable = g_settings_get_boolean (settings, key);
return;
mateconf_value = mateconf_entry_get_value (entry);
if (mateconf_value &&
mateconf_value->type == MATECONF_VALUE_BOOL)
enable = mateconf_value_get_bool (mateconf_value);
else
enable = TRUE;
if (enable == app->enable_mnemonics) if (enable == app->enable_mnemonics)
return; return;
@ -1029,25 +985,14 @@ terminal_app_enable_mnemonics_notify_cb (MateConfClient *client,
} }
static void static void
terminal_app_enable_menu_accels_notify_cb (MateConfClient *client, terminal_app_enable_menu_accels_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry,
gpointer user_data) gpointer user_data)
{ {
TerminalApp *app = TERMINAL_APP (user_data); TerminalApp *app = TERMINAL_APP (user_data);
MateConfValue *mateconf_value;
gboolean enable; gboolean enable;
if (strcmp (mateconf_entry_get_key (entry), ENABLE_MENU_BAR_ACCEL_KEY) != 0) enable = g_settings_get_boolean (settings, key);
return;
mateconf_value = mateconf_entry_get_value (entry);
if (mateconf_value &&
mateconf_value->type == MATECONF_VALUE_BOOL)
enable = mateconf_value_get_bool (mateconf_value);
else
enable = TRUE;
if (enable == app->enable_menu_accels) if (enable == app->enable_menu_accels)
return; return;
@ -1073,7 +1018,6 @@ new_profile_response_cb (GtkWidget *new_profile_dialog,
GtkWindow *transient_parent; GtkWindow *transient_parent;
GtkWidget *confirm_dialog; GtkWidget *confirm_dialog;
gint retval; gint retval;
GSList *list;
base_option_menu = g_object_get_data (G_OBJECT (new_profile_dialog), "base_option_menu"); base_option_menu = g_object_get_data (G_OBJECT (new_profile_dialog), "base_option_menu");
base_profile = profile_combo_box_get_selected (base_option_menu); base_profile = profile_combo_box_get_selected (base_option_menu);
@ -1120,17 +1064,10 @@ new_profile_response_cb (GtkWidget *new_profile_dialog,
g_strdup (new_profile_name), g_strdup (new_profile_name),
new_profile /* adopts the refcount */); new_profile /* adopts the refcount */);
/* And now save the list to mateconf */ /* And now save the new profile name to GSettings */
list = mateconf_client_get_list (app->conf, terminal_gsettings_append_strv (app->settings_global,
CONF_GLOBAL_PREFIX"/profile_list", PROFILE_LIST_KEY,
MATECONF_VALUE_STRING, new_profile_name);
NULL);
list = g_slist_append (list, g_strdup (new_profile_name));
mateconf_client_set_list (app->conf,
CONF_GLOBAL_PREFIX"/profile_list",
MATECONF_VALUE_STRING,
list,
NULL);
terminal_profile_edit (new_profile, transient_parent, NULL); terminal_profile_edit (new_profile, transient_parent, NULL);
@ -1375,20 +1312,6 @@ terminal_app_init (TerminalApp *app)
global_app = app; global_app = app;
/* If the mateconf daemon isn't available (e.g. because there's no dbus
* session bus running), we'd crash later on. Tell the user about it
* now, and exit. See bug #561663.
* Don't use mateconf_ping_daemon() here since the server may just not
* be running yet, but able to be started. See comments on bug #564649.
*/
if (!mateconf_spawn_daemon (&error))
{
g_printerr ("Failed to summon the MateConf demon; exiting. %s\n", error->message);
g_error_free (error);
exit (EXIT_FAILURE);
}
gtk_window_set_default_icon_name (MATE_TERMINAL_ICON_NAME); gtk_window_set_default_icon_name (MATE_TERMINAL_ICON_NAME);
/* Initialise defaults */ /* Initialise defaults */
@ -1399,63 +1322,59 @@ terminal_app_init (TerminalApp *app)
app->encodings = terminal_encodings_get_builtins (); app->encodings = terminal_encodings_get_builtins ();
app->conf = mateconf_client_get_default (); app->settings_global = g_settings_new (CONF_GLOBAL_SCHEMA);
app->settings_font = g_settings_new (MONOSPACE_FONT_SCHEMA);
mateconf_client_add_dir (app->conf, CONF_GLOBAL_PREFIX, g_signal_connect (app->settings_global,
MATECONF_CLIENT_PRELOAD_ONELEVEL, "changed::" PROFILE_LIST_KEY,
NULL); G_CALLBACK(terminal_app_profile_list_notify_cb),
mateconf_client_add_dir (app->conf, MONOSPACE_FONT_DIR, app);
MATECONF_CLIENT_PRELOAD_ONELEVEL,
NULL);
mateconf_client_add_dir (app->conf, CONF_PROXY_PREFIX,
MATECONF_CLIENT_PRELOAD_ONELEVEL,
NULL);
mateconf_client_add_dir (app->conf, CONF_HTTP_PROXY_PREFIX,
MATECONF_CLIENT_PRELOAD_ONELEVEL,
NULL);
app->profile_list_notify_id = g_signal_connect (app->settings_global,
mateconf_client_notify_add (app->conf, PROFILE_LIST_KEY, "changed::" DEFAULT_PROFILE_KEY,
terminal_app_profile_list_notify_cb, G_CALLBACK(terminal_app_default_profile_notify_cb),
app, NULL, NULL); app);
app->default_profile_notify_id = g_signal_connect (app->settings_global,
mateconf_client_notify_add (app->conf, "changed::" ENCODING_LIST_KEY,
DEFAULT_PROFILE_KEY, G_CALLBACK(terminal_app_encoding_list_notify_cb),
terminal_app_default_profile_notify_cb, app);
app, NULL, NULL);
app->encoding_list_notify_id = g_signal_connect (app->settings_font,
mateconf_client_notify_add (app->conf, "changed::" MONOSPACE_FONT_KEY,
ENCODING_LIST_KEY, G_CALLBACK(terminal_app_system_font_notify_cb),
terminal_app_encoding_list_notify_cb, app);
app, NULL, NULL);
app->system_font_notify_id =
mateconf_client_notify_add (app->conf,
MONOSPACE_FONT_KEY,
terminal_app_system_font_notify_cb,
app, NULL, NULL);
app->enable_mnemonics_notify_id = g_signal_connect (app->settings_global,
mateconf_client_notify_add (app->conf, "changed::" ENABLE_MNEMONICS_KEY,
ENABLE_MNEMONICS_KEY, G_CALLBACK(terminal_app_enable_mnemonics_notify_cb),
terminal_app_enable_mnemonics_notify_cb, app);
app, NULL, NULL);
app->enable_menu_accels_notify_id = g_signal_connect (app->settings_global,
mateconf_client_notify_add (app->conf, "changed::" ENABLE_MENU_BAR_ACCEL_KEY,
ENABLE_MENU_BAR_ACCEL_KEY, G_CALLBACK(terminal_app_enable_menu_accels_notify_cb),
terminal_app_enable_menu_accels_notify_cb, app);
app, NULL, NULL);
/* Load the settings */ /* Load the settings */
mateconf_client_notify (app->conf, PROFILE_LIST_KEY); terminal_app_profile_list_notify_cb (app->settings_global,
mateconf_client_notify (app->conf, DEFAULT_PROFILE_KEY); PROFILE_LIST_KEY,
mateconf_client_notify (app->conf, ENCODING_LIST_KEY); app);
mateconf_client_notify (app->conf, MONOSPACE_FONT_KEY); terminal_app_default_profile_notify_cb (app->settings_global,
mateconf_client_notify (app->conf, ENABLE_MENU_BAR_ACCEL_KEY); DEFAULT_PROFILE_KEY,
mateconf_client_notify (app->conf, ENABLE_MNEMONICS_KEY); app);
terminal_app_encoding_list_notify_cb (app->settings_global,
ENCODING_LIST_KEY,
app);
terminal_app_system_font_notify_cb (app->settings_font,
MONOSPACE_FONT_KEY,
app);
terminal_app_enable_menu_accels_notify_cb (app->settings_global,
ENABLE_MENU_BAR_ACCEL_KEY,
app);
terminal_app_enable_mnemonics_notify_cb (app->settings_global,
ENABLE_MNEMONICS_KEY,
app);
/* Ensure we have valid settings */ /* Ensure we have valid settings */
g_assert (app->default_profile_id != NULL); g_assert (app->default_profile_id != NULL);
@ -1498,24 +1417,27 @@ terminal_app_finalize (GObject *object)
g_signal_handlers_disconnect_matched (sm_client, G_SIGNAL_MATCH_DATA, g_signal_handlers_disconnect_matched (sm_client, G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, app); 0, 0, NULL, NULL, app);
#endif #endif
g_signal_handlers_disconnect_by_func (app->settings_global,
G_CALLBACK(terminal_app_profile_list_notify_cb),
app);
g_signal_handlers_disconnect_by_func (app->settings_global,
G_CALLBACK(terminal_app_default_profile_notify_cb),
app);
g_signal_handlers_disconnect_by_func (app->settings_global,
G_CALLBACK(terminal_app_encoding_list_notify_cb),
app);
g_signal_handlers_disconnect_by_func (app->settings_font,
G_CALLBACK(terminal_app_system_font_notify_cb),
app);
g_signal_handlers_disconnect_by_func (app->settings_global,
G_CALLBACK(terminal_app_enable_menu_accels_notify_cb),
app);
g_signal_handlers_disconnect_by_func (app->settings_global,
G_CALLBACK(terminal_app_enable_mnemonics_notify_cb),
app);
if (app->profile_list_notify_id != 0) g_object_unref (app->settings_global);
mateconf_client_notify_remove (app->conf, app->profile_list_notify_id); g_object_unref (app->settings_font);
if (app->default_profile_notify_id != 0)
mateconf_client_notify_remove (app->conf, app->default_profile_notify_id);
if (app->encoding_list_notify_id != 0)
mateconf_client_notify_remove (app->conf, app->encoding_list_notify_id);
if (app->system_font_notify_id != 0)
mateconf_client_notify_remove (app->conf, app->system_font_notify_id);
if (app->enable_menu_accels_notify_id != 0)
mateconf_client_notify_remove (app->conf, app->enable_menu_accels_notify_id);
if (app->enable_mnemonics_notify_id != 0)
mateconf_client_notify_remove (app->conf, app->enable_mnemonics_notify_id);
mateconf_client_remove_dir (app->conf, CONF_GLOBAL_PREFIX, NULL);
mateconf_client_remove_dir (app->conf, MONOSPACE_FONT_DIR, NULL);
g_object_unref (app->conf);
g_free (app->default_profile_id); g_free (app->default_profile_id);
@ -1575,11 +1497,11 @@ terminal_app_set_property (GObject *object,
{ {
case PROP_ENABLE_MENU_BAR_ACCEL: case PROP_ENABLE_MENU_BAR_ACCEL:
app->enable_menu_accels = g_value_get_boolean (value); app->enable_menu_accels = g_value_get_boolean (value);
mateconf_client_set_bool (app->conf, ENABLE_MENU_BAR_ACCEL_KEY, app->enable_menu_accels, NULL); g_settings_set_boolean (app->settings_global, ENABLE_MENU_BAR_ACCEL_KEY, app->enable_menu_accels);
break; break;
case PROP_ENABLE_MNEMONICS: case PROP_ENABLE_MNEMONICS:
app->enable_mnemonics = g_value_get_boolean (value); app->enable_mnemonics = g_value_get_boolean (value);
mateconf_client_set_bool (app->conf, ENABLE_MNEMONICS_KEY, app->enable_mnemonics, NULL); g_settings_set_boolean (app->settings_global, ENABLE_MNEMONICS_KEY, app->enable_mnemonics);
break; break;
case PROP_DEFAULT_PROFILE: case PROP_DEFAULT_PROFILE:
case PROP_SYSTEM_FONT: case PROP_SYSTEM_FONT:

10
src/terminal-app.h
View File

@ -57,10 +57,12 @@ G_BEGIN_DECLS
/* Configuration */ /* Configuration */
#define CONF_PREFIX "/apps/mate-terminal" #define CONF_PREFIX "org.mate.terminal"
#define CONF_GLOBAL_PREFIX CONF_PREFIX "/global" #define CONF_GLOBAL_SCHEMA CONF_PREFIX ".global"
#define CONF_PROFILES_PREFIX CONF_PREFIX "/profiles" #define CONF_PROFILES_SCHEMA CONF_PREFIX ".profiles"
#define CONF_KEYS_PREFIX CONF_PREFIX "/keybindings" #define CONF_PROFILE_SCHEMA CONF_PREFIX ".profile"
#define CONF_KEYS_SCHEMA CONF_PREFIX ".keybindings"
#define CONF_PROFILE_PREFIX "/org/mate/terminal/profiles/"
#define MATE_TERMINAL_ICON_NAME "utilities-terminal" #define MATE_TERMINAL_ICON_NAME "utilities-terminal"

113
src/terminal-dconf.c 100644
View File

@ -0,0 +1,113 @@
/*
* terminal-dconf.c: helper API for dconf
*
* Copyright (C) 2011 Novell, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Authors:
* Vincent Untz <vuntz@gnome.org>
* Stefano Karapetsas <stefano@karapetsas.com>
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <dconf.h>
#include "terminal-dconf.h"
static DConfClient *
terminal_dconf_client_get (void)
{
#ifdef HAVE_DCONF_NEW
return dconf_client_new ();
#else
return dconf_client_new (NULL, NULL, NULL, NULL);
#endif
}
gboolean
terminal_dconf_write_sync (const gchar *key,
GVariant *value,
GError **error)
{
gboolean ret;
DConfClient *client = terminal_dconf_client_get ();
#ifdef HAVE_DCONF_NEW
ret = dconf_client_write_sync (client, key, value, NULL, NULL, error);
#else
ret = dconf_client_write (client, key, value, NULL, NULL, error);
#endif
g_object_unref (client);
return ret;
}
gboolean
terminal_dconf_recursive_reset (const gchar *dir,
GError **error)
{
gboolean ret;
DConfClient *client = terminal_dconf_client_get ();
#ifdef HAVE_DCONF_NEW
ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error);
#else
ret = dconf_client_write (client, dir, NULL, NULL, NULL, error);
#endif
g_object_unref (client);
return ret;
}
gchar **
terminal_dconf_list_subdirs (const gchar *dir,
gboolean remove_trailing_slash)
{
GArray *array;
gchar **children;
int len;
int i;
DConfClient *client = terminal_dconf_client_get ();
array = g_array_new (TRUE, TRUE, sizeof (gchar *));
children = dconf_client_list (client, dir, &len);
g_object_unref (client);
for (i = 0; children[i] != NULL; i++) {
if (dconf_is_rel_dir (children[i], NULL)) {
char *val = g_strdup (children[i]);
if (remove_trailing_slash)
val[strlen (val) - 1] = '\0';
array = g_array_append_val (array, val);
}
}
g_strfreev (children);
return (gchar **) g_array_free (array, FALSE);
}

44
src/terminal-dconf.h 100644
View File

@ -0,0 +1,44 @@
/*
* terminal-dconf.h: helper API for dconf
*
* Copyright (C) 2011 Novell, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Authors:
* Vincent Untz <vuntz@gnome.org>
*/
#ifndef __TERMINAL_DCONF_H__
#define __TERMINAL_DCONF_H__
#include <glib.h>
G_BEGIN_DECLS
gboolean terminal_dconf_write_sync (const gchar *key,
GVariant *value,
GError **error);
gboolean terminal_dconf_recursive_reset (const gchar *dir,
GError **error);
gchar **terminal_dconf_list_subdirs (const gchar *dir,
gboolean remove_trailing_slash);
G_END_DECLS
#endif /* __TERMINAL_DCONF_H__ */

31
src/terminal-encoding.c
View File

@ -31,7 +31,7 @@
/* Overview /* Overview
* *
* There's a list of character sets stored in mateconf, indicating * There's a list of character sets stored in GSettings, indicating
* which encodings to display in the encoding menu. * which encodings to display in the encoding menu.
* *
* We have a pre-canned list of available encodings * We have a pre-canned list of available encodings
@ -39,7 +39,7 @@
* the encoding menu, and to give a human-readable name * the encoding menu, and to give a human-readable name
* to certain encodings. * to certain encodings.
* *
* If the mateconf list contains an encoding not in the * If the GSettings list contains an encoding not in the
* predetermined table, then that encoding is * predetermined table, then that encoding is
* labeled "user defined" but still appears in the menu. * labeled "user defined" but still appears in the menu.
*/ */
@ -285,29 +285,28 @@ terminal_encoding_get_type (void)
} }
static void static void
update_active_encodings_mateconf (void) update_active_encodings_gsettings (void)
{ {
GSList *list, *l; GSList *list, *l;
GSList *strings = NULL; GArray *strings;
MateConfClient *conf; gchar *id_string;
GSettings *settings;
list = terminal_app_get_active_encodings (terminal_app_get ()); list = terminal_app_get_active_encodings (terminal_app_get ());
strings = g_array_new (TRUE, TRUE, sizeof (gchar *));
for (l = list; l != NULL; l = l->next) for (l = list; l != NULL; l = l->next)
{ {
TerminalEncoding *encoding = (TerminalEncoding *) l->data; TerminalEncoding *encoding = (TerminalEncoding *) l->data;
id_string = terminal_encoding_get_id (encoding);
strings = g_slist_prepend (strings, (gpointer) terminal_encoding_get_id (encoding)); strings = g_array_append_val (strings, id_string);
} }
conf = mateconf_client_get_default (); settings = g_settings_new (CONF_GLOBAL_SCHEMA);
mateconf_client_set_list (conf, g_settings_set_strv (settings, "active-encodings", (const gchar **) strings->data);
CONF_GLOBAL_PREFIX"/active_encodings", g_object_unref (settings);
MATECONF_VALUE_STRING,
strings,
NULL);
g_object_unref (conf);
g_slist_free (strings); g_array_free (strings, TRUE);
g_slist_foreach (list, (GFunc) terminal_encoding_unref, NULL); g_slist_foreach (list, (GFunc) terminal_encoding_unref, NULL);
g_slist_free (list); g_slist_free (list);
} }
@ -385,10 +384,10 @@ button_clicked_cb (GtkWidget *button,
terminal_encoding_unref (encoding); terminal_encoding_unref (encoding);
/* We don't need to emit row-changed here, since updating the mateconf pref /* We don't need to emit row-changed here, since updating the GSettings pref
* will update the models. * will update the models.
*/ */
update_active_encodings_mateconf (); update_active_encodings_gsettings ();
} }
static void static void

177
src/terminal-gsettings.c 100644
View File

@ -0,0 +1,177 @@
/*
* terminal-gsettings.c: terminal gsettings utility methods
*
* Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
* 2012 Stefano Karapetsas
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Glynn Foster <glynn.foster@sun.com>
* Stefano Karapetsas <stefano@karapetsas.com>
*/
#include <config.h>
#include "terminal-gsettings.h"
#include <string.h>
#include <glib.h>
#include <gio/gio.h>
/* (copied from gnome-panel)
* Adapted from is_valid_keyname() in glib (gio/glib-compile-schemas.c)
* Differences:
* - gettext support removed (we don't need translations here)
* - remove support for allow_any_name
*/
gboolean
terminal_gsettings_is_valid_keyname (const gchar *key,
GError **error)
{
gint i;
if (key[0] == '\0')
{
g_set_error_literal (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"empty names are not permitted");
return FALSE;
}
if (!g_ascii_islower (key[0]))
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"invalid name '%s': names must begin "
"with a lowercase letter", key);
return FALSE;
}
for (i = 1; key[i]; i++)
{
if (key[i] != '-' &&
!g_ascii_islower (key[i]) &&
!g_ascii_isdigit (key[i]))
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"invalid name '%s': invalid character '%c'; "
"only lowercase letters, numbers and dash ('-') "
"are permitted.", key, key[i]);
return FALSE;
}
if (key[i] == '-' && key[i + 1] == '-')
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"invalid name '%s': two successive dashes ('--') "
"are not permitted.", key);
return FALSE;
}
}
if (key[i - 1] == '-')
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"invalid name '%s': the last character may not be a "
"dash ('-').", key);
return FALSE;
}
if (i > 32)
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"invalid name '%s': maximum length is 32", key);
return FALSE;
}
return TRUE;
}
/* copied from gnome-panel */
gboolean
terminal_gsettings_append_strv (GSettings *settings,
const gchar *key,
const gchar *value)
{
gchar **old;
gchar **new;
gint size;
gboolean retval;
old = g_settings_get_strv (settings, key);
for (size = 0; old[size] != NULL; size++);
size += 1; /* appended value */
size += 1; /* NULL */
new = g_realloc_n (old, size, sizeof (gchar *));
new[size - 2] = g_strdup (value);
new[size - 1] = NULL;
retval = g_settings_set_strv (settings, key,
(const gchar **) new);
g_strfreev (new);
return retval;
}
/* copied from gnome-panel */
gboolean
terminal_gsettings_remove_all_from_strv (GSettings *settings,
const gchar *key,
const gchar *value)
{
GArray *array;
gchar **old;
gint i;
gboolean retval;
old = g_settings_get_strv (settings, key);
array = g_array_new (TRUE, TRUE, sizeof (gchar *));
for (i = 0; old[i] != NULL; i++) {
if (g_strcmp0 (old[i], value) != 0)
array = g_array_append_val (array, old[i]);
}
retval = g_settings_set_strv (settings, key,
(const gchar **) array->data);
g_strfreev (old);
g_array_free (array, TRUE);
return retval;
}
/* convert a gchar ** to GList (taken from libmatekbd code) */
GSList*
terminal_gsettings_strv_to_gslist (gchar **array)
{
GSList *list = NULL;
gint i;
if (array != NULL) {
for (i = 0; array[i]; i++) {
list = g_slist_append (list, g_strdup (array[i]));
}
}
return list;
}

52
src/terminal-gsettings.h 100644
View File

@ -0,0 +1,52 @@
/*
* terminal-gsettings.h: terminal gsettings utility methods
*
* Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
* 2012 Stefano Karapetsas
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Glynn Foster <glynn.foster@sun.com>
* Stefano Karapetsas <stefano@karapetsas.com>
*/
#ifndef __TERMINAL_GSETTINGS_H__
#define __TERMINAL_GSETTINGS_H__
#include <glib.h>
#include <gio/gio.h>
G_BEGIN_DECLS
gboolean terminal_gsettings_is_valid_keyname (const gchar *key,
GError **error);
gboolean terminal_gsettings_append_strv (GSettings *settings,
const gchar *key,
const gchar *value);
gboolean terminal_gsettings_remove_all_from_strv (GSettings *settings,
const gchar *key,
const gchar *value);
GSList* terminal_gsettings_strv_to_gslist (gchar **array);
G_END_DECLS
#endif /* __TEMRINAL_GSETTINGS_H__ */

368
src/terminal-profile.c
View File

@ -24,8 +24,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <mateconf/mateconf-client.h>
#include "terminal-app.h" #include "terminal-app.h"
#include "terminal-debug.h" #include "terminal-debug.h"
#include "terminal-intl.h" #include "terminal-intl.h"
@ -39,8 +37,8 @@
* - add a #define with its name in terminal-profile.h * - add a #define with its name in terminal-profile.h
* - add a gobject property for it in terminal_profile_class_init * - add a gobject property for it in terminal_profile_class_init
* - if the property's type needs special casing, add that to * - if the property's type needs special casing, add that to
* terminal_profile_mateconf_notify_cb and * terminal_profile_gsettings_notify_cb and
* terminal_profile_mateconf_changeset_add * terminal_profile_gsettings_changeset_add
* - if necessary the default value cannot be handled via the paramspec, * - if necessary the default value cannot be handled via the paramspec,
* handle that in terminal_profile_reset_property_internal * handle that in terminal_profile_reset_property_internal
*/ */
@ -89,45 +87,45 @@ enum
LAST_PROP LAST_PROP
}; };
#define KEY_ALLOW_BOLD "allow_bold" #define KEY_ALLOW_BOLD "allow-bold"
#define KEY_BACKGROUND_COLOR "background_color" #define KEY_BACKGROUND_COLOR "background-color"
#define KEY_BACKGROUND_DARKNESS "background_darkness" #define KEY_BACKGROUND_DARKNESS "background-darkness"
#define KEY_BACKGROUND_IMAGE_FILE "background_image" #define KEY_BACKGROUND_IMAGE_FILE "background-image"
#define KEY_BACKGROUND_TYPE "background_type" #define KEY_BACKGROUND_TYPE "background-type"
#define KEY_BACKSPACE_BINDING "backspace_binding" #define KEY_BACKSPACE_BINDING "backspace-binding"
#define KEY_BOLD_COLOR "bold_color" #define KEY_BOLD_COLOR "bold-color"
#define KEY_BOLD_COLOR_SAME_AS_FG "bold_color_same_as_fg" #define KEY_BOLD_COLOR_SAME_AS_FG "bold-color-same-as-fg"
#define KEY_CURSOR_BLINK_MODE "cursor_blink_mode" #define KEY_CURSOR_BLINK_MODE "cursor-blink-mode"
#define KEY_CURSOR_SHAPE "cursor_shape" #define KEY_CURSOR_SHAPE "cursor-shape"
#define KEY_CUSTOM_COMMAND "custom_command" #define KEY_CUSTOM_COMMAND "custom-command"
#define KEY_DEFAULT_SHOW_MENUBAR "default_show_menubar" #define KEY_DEFAULT_SHOW_MENUBAR "default-show-menubar"
#define KEY_DEFAULT_SIZE_COLUMNS "default_size_columns" #define KEY_DEFAULT_SIZE_COLUMNS "default-size-columns"
#define KEY_DEFAULT_SIZE_ROWS "default_size_rows" #define KEY_DEFAULT_SIZE_ROWS "default-size-rows"
#define KEY_DELETE_BINDING "delete_binding" #define KEY_DELETE_BINDING "delete-binding"
#define KEY_EXIT_ACTION "exit_action" #define KEY_EXIT_ACTION "exit-action"
#define KEY_FONT "font" #define KEY_FONT "font"
#define KEY_FOREGROUND_COLOR "foreground_color" #define KEY_FOREGROUND_COLOR "foreground-color"
#define KEY_LOGIN_SHELL "login_shell" #define KEY_LOGIN_SHELL "login-shell"
#define KEY_PALETTE "palette" #define KEY_PALETTE "palette"
#define KEY_SCROLL_BACKGROUND "scroll_background" #define KEY_SCROLL_BACKGROUND "scroll-background"
#define KEY_SCROLLBACK_LINES "scrollback_lines" #define KEY_SCROLLBACK_LINES "scrollback-lines"
#define KEY_SCROLLBACK_UNLIMITED "scrollback_unlimited" #define KEY_SCROLLBACK_UNLIMITED "scrollback-unlimited"
#define KEY_SCROLLBAR_POSITION "scrollbar_position" #define KEY_SCROLLBAR_POSITION "scrollbar-position"
#define KEY_SCROLL_ON_KEYSTROKE "scroll_on_keystroke" #define KEY_SCROLL_ON_KEYSTROKE "scroll-on-keystroke"
#define KEY_SCROLL_ON_OUTPUT "scroll_on_output" #define KEY_SCROLL_ON_OUTPUT "scroll-on-output"
#define KEY_SILENT_BELL "silent_bell" #define KEY_SILENT_BELL "silent-bell"
#define KEY_TITLE_MODE "title_mode" #define KEY_TITLE_MODE "title-mode"
#define KEY_TITLE "title" #define KEY_TITLE "title"
#define KEY_UPDATE_RECORDS "update_records" #define KEY_UPDATE_RECORDS "update-records"
#define KEY_USE_CUSTOM_COMMAND "use_custom_command" #define KEY_USE_CUSTOM_COMMAND "use-custom-command"
#define KEY_USE_CUSTOM_DEFAULT_SIZE "use_custom_default_size" #define KEY_USE_CUSTOM_DEFAULT_SIZE "use-custom-default-size"
#define KEY_USE_SKEY "use_skey" #define KEY_USE_SKEY "use-skey"
#define KEY_USE_SYSTEM_FONT "use_system_font" #define KEY_USE_SYSTEM_FONT "use-system-font"
#define KEY_USE_THEME_COLORS "use_theme_colors" #define KEY_USE_THEME_COLORS "use-theme-colors"
#define KEY_VISIBLE_NAME "visible_name" #define KEY_VISIBLE_NAME "visible-name"
#define KEY_WORD_CHARS "word_chars" #define KEY_WORD_CHARS "word-chars"
/* Keep these in sync with the MateConf schema! */ /* Keep these in sync with the GSettings schema! */
#define DEFAULT_ALLOW_BOLD (TRUE) #define DEFAULT_ALLOW_BOLD (TRUE)
#define DEFAULT_BACKGROUND_COLOR ("#FFFFDD") #define DEFAULT_BACKGROUND_COLOR ("#FFFFDD")
#define DEFAULT_BOLD_COLOR_SAME_AS_FG (TRUE) #define DEFAULT_BOLD_COLOR_SAME_AS_FG (TRUE)
@ -172,33 +170,19 @@ struct _TerminalProfilePrivate
GValueArray *properties; GValueArray *properties;
gboolean *locked; gboolean *locked;
MateConfClient *conf; GSettings *settings;
char *profile_dir; char *profile_dir;
guint notify_id;
GSList *dirty_pspecs; GSList *dirty_pspecs;
guint save_idle_id; guint save_idle_id;
GParamSpec *mateconf_notification_pspec; GParamSpec *gsettings_notification_pspec;
gboolean background_load_failed; gboolean background_load_failed;
guint forgotten : 1; guint forgotten : 1;
}; };
/* We have to continue to use these since they're unfortunately different
* from the value nicks of the vte_terminal_erase_binding_get_type() enum type.
*/
static const MateConfEnumStringPair erase_bindings[] =
{
{ VTE_ERASE_AUTO, "auto" },
{ VTE_ERASE_ASCII_BACKSPACE, "control-h" },
{ VTE_ERASE_ASCII_DELETE, "ascii-del" },
{ VTE_ERASE_DELETE_SEQUENCE, "escape-sequence" },
{ VTE_ERASE_TTY, "tty" },
{ -1, NULL }
};
static const GdkColor terminal_palettes[TERMINAL_PALETTE_N_BUILTINS][TERMINAL_PALETTE_SIZE] = static const GdkColor terminal_palettes[TERMINAL_PALETTE_N_BUILTINS][TERMINAL_PALETTE_SIZE] =
{ {
/* Tango palette */ /* Tango palette */
@ -302,7 +286,7 @@ static void ensure_pixbuf_property (TerminalProfile *profile,
gboolean *load_failed); gboolean *load_failed);
static guint signals[LAST_SIGNAL]; static guint signals[LAST_SIGNAL];
static GQuark mateconf_key_quark; static GQuark gsettings_key_quark;
G_DEFINE_TYPE (TerminalProfile, terminal_profile, G_TYPE_OBJECT); G_DEFINE_TYPE (TerminalProfile, terminal_profile, G_TYPE_OBJECT);
@ -531,119 +515,95 @@ terminal_profile_reset_property_internal (TerminalProfile *profile,
} }
static void static void
terminal_profile_mateconf_notify_cb (MateConfClient *client, terminal_profile_gsettings_notify_cb (GSettings *settings,
guint cnxn_id, gchar *key,
MateConfEntry *entry, gpointer user_data)
gpointer user_data)
{ {
TerminalProfile *profile = TERMINAL_PROFILE (user_data); TerminalProfile *profile = TERMINAL_PROFILE (user_data);
TerminalProfilePrivate *priv = profile->priv; TerminalProfilePrivate *priv = profile->priv;
TerminalProfileClass *klass; TerminalProfileClass *klass;
const char *key; GVariant *settings_value;
MateConfValue *mateconf_value;
GParamSpec *pspec; GParamSpec *pspec;
GValue value = { 0, }; GValue value = { 0, };
gboolean equal; gboolean equal;
gboolean force_set = FALSE; gboolean force_set = FALSE;
key = mateconf_entry_get_key (entry); if (!key) return;
if (!key || !g_str_has_prefix (key, priv->profile_dir))
return;
_terminal_debug_print (TERMINAL_DEBUG_PROFILE, _terminal_debug_print (TERMINAL_DEBUG_PROFILE,
"MateConf notification for key %s [%s]\n", "GSettings notification for key %s [%s]\n",
key, key,
mateconf_entry_get_is_writable (entry) ? "writable" : "LOCKED"); g_settings_is_writable (settings, key) ? "writable" : "LOCKED");
key += strlen (priv->profile_dir);
if (!key[0])
return;
key++;
klass = TERMINAL_PROFILE_GET_CLASS (profile); klass = TERMINAL_PROFILE_GET_CLASS (profile);
pspec = g_hash_table_lookup (klass->mateconf_keys, key); pspec = g_hash_table_lookup (klass->gsettings_keys, key);
if (!pspec) if (!pspec)
return; /* ignore unknown keys, for future extensibility */ return; /* ignore unknown keys, for future extensibility */
priv->locked[pspec->param_id] = !mateconf_entry_get_is_writable (entry); priv->locked[pspec->param_id] = !g_settings_is_writable (settings, key);
mateconf_value = mateconf_entry_get_value (entry); settings_value = g_settings_get_value (settings, key);
if (!mateconf_value) if (!settings_value)
return; return;
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec)); g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
if (G_IS_PARAM_SPEC_BOOLEAN (pspec)) if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
{ {
if (mateconf_value->type != MATECONF_VALUE_BOOL) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_BOOLEAN))
goto out; goto out;
g_value_set_boolean (&value, mateconf_value_get_bool (mateconf_value)); g_value_set_boolean (&value, g_variant_get_boolean (settings_value));
} }
else if (G_IS_PARAM_SPEC_STRING (pspec)) else if (G_IS_PARAM_SPEC_STRING (pspec))
{ {
if (mateconf_value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_STRING))
goto out; goto out;
g_value_set_string (&value, mateconf_value_get_string (mateconf_value)); g_value_set_string (&value, g_variant_get_string (settings_value, NULL));
} }
else if (G_IS_PARAM_SPEC_ENUM (pspec)) else if (G_IS_PARAM_SPEC_ENUM (pspec))
{ {
const GEnumValue *eval;
int enum_value;
if (mateconf_value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_STRING))
goto out; goto out;
eval = g_enum_get_value_by_nick (G_PARAM_SPEC_ENUM (pspec)->enum_class, g_value_set_enum (&value, g_settings_get_enum (settings, key));
mateconf_value_get_string (mateconf_value));
if (eval)
enum_value = eval->value;
else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == vte_terminal_erase_binding_get_type ())
{
/* Backward compatibility */
if (!mateconf_string_to_enum ((MateConfEnumStringPair*) erase_bindings,
mateconf_value_get_string (mateconf_value),
&enum_value))
goto out;
}
else
goto out;
g_value_set_enum (&value, enum_value);
} }
else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_COLOR) else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_COLOR)
{ {
GdkColor color; GdkColor color;
if (mateconf_value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_STRING))
goto out; goto out;
if (!gdk_color_parse (mateconf_value_get_string (mateconf_value), &color)) if (!gdk_color_parse (g_variant_get_string (settings_value, NULL), &color))
goto out; goto out;
g_value_set_boxed (&value, &color); g_value_set_boxed (&value, &color);
} }
else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == PANGO_TYPE_FONT_DESCRIPTION) else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == PANGO_TYPE_FONT_DESCRIPTION)
{ {
if (mateconf_value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_STRING))
goto out; goto out;
g_value_take_boxed (&value, pango_font_description_from_string (mateconf_value_get_string (mateconf_value))); g_value_take_boxed (&value, pango_font_description_from_string (g_variant_get_string (settings_value, NULL)));
} }
else if (G_IS_PARAM_SPEC_DOUBLE (pspec)) else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
{ {
if (mateconf_value->type != MATECONF_VALUE_FLOAT) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_DOUBLE))
goto out; goto out;
g_value_set_double (&value, mateconf_value_get_float (mateconf_value)); g_value_set_double (&value, g_variant_get_double (settings_value));
} }
else if (G_IS_PARAM_SPEC_INT (pspec)) else if (G_IS_PARAM_SPEC_INT (pspec))
{ {
if (mateconf_value->type != MATECONF_VALUE_INT) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_INT16) &&
!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_INT32) &&
!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_INT64))
goto out; goto out;
g_value_set_int (&value, mateconf_value_get_int (mateconf_value)); g_value_set_int (&value, g_settings_get_int(settings, key));
} }
else if (G_IS_PARAM_SPEC_VALUE_ARRAY (pspec) && else if (G_IS_PARAM_SPEC_VALUE_ARRAY (pspec) &&
G_PARAM_SPEC_VALUE_TYPE (G_PARAM_SPEC_VALUE_ARRAY (pspec)->element_spec) == GDK_TYPE_COLOR) G_PARAM_SPEC_VALUE_TYPE (G_PARAM_SPEC_VALUE_ARRAY (pspec)->element_spec) == GDK_TYPE_COLOR)
@ -652,10 +612,10 @@ terminal_profile_mateconf_notify_cb (MateConfClient *client,
GdkColor *colors; GdkColor *colors;
int n_colors, i; int n_colors, i;
if (mateconf_value->type != MATECONF_VALUE_STRING) if (!g_variant_is_of_type (settings_value, G_VARIANT_TYPE_STRING))
goto out; goto out;
color_strings = g_strsplit (mateconf_value_get_string (mateconf_value), ":", -1); color_strings = g_strsplit (g_variant_get_string (settings_value, NULL), ":", -1);
if (!color_strings) if (!color_strings)
goto out; goto out;
@ -684,8 +644,8 @@ terminal_profile_mateconf_notify_cb (MateConfClient *client,
if (g_param_value_validate (pspec, &value)) if (g_param_value_validate (pspec, &value))
{ {
_terminal_debug_print (TERMINAL_DEBUG_PROFILE, _terminal_debug_print (TERMINAL_DEBUG_PROFILE,
"Invalid value in mateconf for key %s was changed to comply with pspec %s\n", "Invalid value in GSettings for key %s was changed to comply with pspec %s\n",
mateconf_entry_get_key (entry), pspec->name); key, pspec->name);
force_set = TRUE; force_set = TRUE;
} }
@ -710,9 +670,9 @@ terminal_profile_mateconf_notify_cb (MateConfClient *client,
if (!equal || force_set) if (!equal || force_set)
{ {
priv->mateconf_notification_pspec = pspec; priv->gsettings_notification_pspec = pspec;
g_object_set_property (G_OBJECT (profile), pspec->name, &value); g_object_set_property (G_OBJECT (profile), pspec->name, &value);
priv->mateconf_notification_pspec = NULL; priv->gsettings_notification_pspec = NULL;
} }
out: out:
@ -721,15 +681,15 @@ out:
*/ */
g_value_unset (&value); g_value_unset (&value);
g_variant_unref (settings_value);
} }
static void static void
terminal_profile_mateconf_changeset_add (TerminalProfile *profile, terminal_profile_gsettings_changeset_add (TerminalProfile *profile,
MateConfChangeSet *changeset, GSettings *changeset,
GParamSpec *pspec) GParamSpec *pspec)
{ {
TerminalProfilePrivate *priv = profile->priv; TerminalProfilePrivate *priv = profile->priv;
const char *mateconf_key;
char *key; char *key;
const GValue *value; const GValue *value;
@ -738,50 +698,36 @@ terminal_profile_mateconf_changeset_add (TerminalProfile *profile,
if (priv->locked[pspec->param_id]) if (priv->locked[pspec->param_id])
return; return;
if (!mateconf_client_key_is_writable (priv->conf, mateconf_key, NULL)) if (!g_settings_is_writable (priv->settings, gsettings_key, NULL))
return; return;
#endif #endif
mateconf_key = g_param_spec_get_qdata (pspec, mateconf_key_quark); key = g_param_spec_get_qdata (pspec, gsettings_key_quark);
if (!mateconf_key) if (!key)
return; return;
key = mateconf_concat_dir_and_key (priv->profile_dir, mateconf_key);
value = g_value_array_get_nth (priv->properties, pspec->param_id); value = g_value_array_get_nth (priv->properties, pspec->param_id);
_terminal_debug_print (TERMINAL_DEBUG_PROFILE, _terminal_debug_print (TERMINAL_DEBUG_PROFILE,
"Adding pspec %s with value %s to the mateconf changeset\n", "Adding pspec %s with value %s to the GSettings changeset\n",
pspec->name, g_strdup_value_contents (value)); pspec->name, g_strdup_value_contents (value));
if (G_IS_PARAM_SPEC_BOOLEAN (pspec)) if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
mateconf_change_set_set_bool (changeset, key, g_value_get_boolean (value)); g_settings_set_boolean (changeset, key, g_value_get_boolean (value));
else if (G_IS_PARAM_SPEC_STRING (pspec)) else if (G_IS_PARAM_SPEC_STRING (pspec))
{ {
const char *str; const char *str;
str = g_value_get_string (value); str = g_value_get_string (value);
mateconf_change_set_set_string (changeset, key, str ? str : ""); g_settings_set_string (changeset, key, str ? str : "");
} }
else if (G_IS_PARAM_SPEC_ENUM (pspec)) else if (G_IS_PARAM_SPEC_ENUM (pspec))
{ {
const GEnumValue *eval; const GEnumValue *eval;
const char *string;
eval = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, g_value_get_enum (value)); eval = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, g_value_get_enum (value));
if (G_PARAM_SPEC_VALUE_TYPE (pspec) == vte_terminal_erase_binding_get_type ()) g_settings_set_enum (changeset, key, eval->value);
{
/* Backward compatibility */
string = mateconf_enum_to_string ((MateConfEnumStringPair*) erase_bindings, g_value_get_enum (value));
if (!string)
goto cleanup;
}
else if (eval)
string = eval->value_nick;
else
goto cleanup;
mateconf_change_set_set_string (changeset, key, string);
} }
else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_COLOR) else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_COLOR)
{ {
@ -798,7 +744,7 @@ terminal_profile_mateconf_changeset_add (TerminalProfile *profile,
color->green, color->green,
color->blue); color->blue);
mateconf_change_set_set_string (changeset, key, str); g_settings_set_string (changeset, key, str);
} }
else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == PANGO_TYPE_FONT_DESCRIPTION) else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == PANGO_TYPE_FONT_DESCRIPTION)
{ {
@ -810,13 +756,13 @@ terminal_profile_mateconf_changeset_add (TerminalProfile *profile,
goto cleanup; goto cleanup;
font = pango_font_description_to_string (font_desc); font = pango_font_description_to_string (font_desc);
mateconf_change_set_set_string (changeset, key, font); g_settings_set_string (changeset, key, font);
g_free (font); g_free (font);
} }
else if (G_IS_PARAM_SPEC_DOUBLE (pspec)) else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
mateconf_change_set_set_float (changeset, key, (float) g_value_get_double (value)); g_settings_set_double (changeset, key, g_value_get_double (value));
else if (G_IS_PARAM_SPEC_INT (pspec)) else if (G_IS_PARAM_SPEC_INT (pspec))
mateconf_change_set_set_int (changeset, key, g_value_get_int (value)); g_settings_set_int (changeset, key, g_value_get_int (value));
else if (G_IS_PARAM_SPEC_VALUE_ARRAY (pspec) && else if (G_IS_PARAM_SPEC_VALUE_ARRAY (pspec) &&
G_PARAM_SPEC_VALUE_TYPE (G_PARAM_SPEC_VALUE_ARRAY (pspec)->element_spec) == GDK_TYPE_COLOR) G_PARAM_SPEC_VALUE_TYPE (G_PARAM_SPEC_VALUE_ARRAY (pspec)->element_spec) == GDK_TYPE_COLOR)
{ {
@ -852,27 +798,28 @@ terminal_profile_mateconf_changeset_add (TerminalProfile *profile,
color->blue); color->blue);
} }
mateconf_change_set_set_string (changeset, key, string->str); g_settings_set_string (changeset, key, string->str);
g_string_free (string, TRUE); g_string_free (string, TRUE);
} }
else else
g_printerr ("Unhandled value type %s of pspec %s\n", g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)), pspec->name); g_printerr ("Unhandled value type %s of pspec %s\n", g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)), pspec->name);
cleanup: cleanup:
g_free (key); return;
} }
static void static void
terminal_profile_save (TerminalProfile *profile) terminal_profile_save (TerminalProfile *profile)
{ {
TerminalProfilePrivate *priv = profile->priv; TerminalProfilePrivate *priv = profile->priv;
MateConfChangeSet *changeset; GSettings *changeset;
GSList *l; GSList *l;
GError *error = NULL; GError *error = NULL;
priv->save_idle_id = 0; priv->save_idle_id = 0;
changeset = g_settings_new_with_path (CONF_PROFILE_SCHEMA,
changeset = mateconf_change_set_new (); g_strconcat (CONF_PROFILE_PREFIX, priv->profile_dir,"/", NULL));
g_settings_delay (changeset);
for (l = priv->dirty_pspecs; l != NULL; l = l->next) for (l = priv->dirty_pspecs; l != NULL; l = l->next)
{ {
@ -884,19 +831,14 @@ terminal_profile_save (TerminalProfile *profile)
if ((pspec->flags & G_PARAM_WRITABLE) == 0) if ((pspec->flags & G_PARAM_WRITABLE) == 0)
continue; continue;
terminal_profile_mateconf_changeset_add (profile, changeset, pspec); terminal_profile_gsettings_changeset_add (profile, changeset, pspec);
} }
g_slist_free (priv->dirty_pspecs); g_slist_free (priv->dirty_pspecs);
priv->dirty_pspecs = NULL; priv->dirty_pspecs = NULL;
if (!mateconf_client_commit_change_set (priv->conf, changeset, TRUE, &error)) g_settings_apply (changeset);
{ g_object_unref (changeset);
g_message ("Failed to commit the changeset to mateconf: %s", error->message);
g_error_free (error);
}
mateconf_change_set_unref (changeset);
} }
static gboolean static gboolean
@ -935,10 +877,7 @@ terminal_profile_init (TerminalProfile *profile)
priv = profile->priv = G_TYPE_INSTANCE_GET_PRIVATE (profile, TERMINAL_TYPE_PROFILE, TerminalProfilePrivate); priv = profile->priv = G_TYPE_INSTANCE_GET_PRIVATE (profile, TERMINAL_TYPE_PROFILE, TerminalProfilePrivate);
priv->mateconf_notification_pspec = NULL; priv->gsettings_notification_pspec = NULL;
priv->conf = mateconf_client_get_default ();
priv->locked = g_new0 (gboolean, LAST_PROP); priv->locked = g_new0 (gboolean, LAST_PROP);
priv->properties = g_value_array_new (LAST_PROP); priv->properties = g_value_array_new (LAST_PROP);
@ -992,14 +931,21 @@ terminal_profile_constructor (GType type,
name = g_value_get_string (g_value_array_get_nth (priv->properties, PROP_NAME)); name = g_value_get_string (g_value_array_get_nth (priv->properties, PROP_NAME));
g_assert (name != NULL); g_assert (name != NULL);
/* Now load those properties from mateconf that were not set as construction params */ priv->settings = g_settings_new_with_path (CONF_PROFILE_SCHEMA,
g_strconcat (CONF_PROFILE_PREFIX, name, "/", NULL));
g_assert (priv->settings != NULL);
g_signal_connect (priv->settings,
g_strconcat("changed::", priv->profile_dir, "/", NULL),
G_CALLBACK(terminal_profile_gsettings_notify_cb),
profile);
/* Now load those properties from GSettings that were not set as construction params */
pspecs = g_object_class_list_properties (G_OBJECT_CLASS (TERMINAL_PROFILE_GET_CLASS (profile)), &n_pspecs); pspecs = g_object_class_list_properties (G_OBJECT_CLASS (TERMINAL_PROFILE_GET_CLASS (profile)), &n_pspecs);
for (i = 0; i < n_pspecs; ++i) for (i = 0; i < n_pspecs; ++i)
{ {
GParamSpec *pspec = pspecs[i]; GParamSpec *pspec = pspecs[i];
guint j; guint j;
gboolean is_construct = FALSE; gboolean is_construct = FALSE;
const char *mateconf_key;
char *key; char *key;
if (pspec->owner_type != TERMINAL_TYPE_PROFILE) if (pspec->owner_type != TERMINAL_TYPE_PROFILE)
@ -1019,13 +965,11 @@ terminal_profile_constructor (GType type,
if (is_construct) if (is_construct)
continue; continue;
mateconf_key = g_param_spec_get_qdata (pspec, mateconf_key_quark); key = g_param_spec_get_qdata (pspec, gsettings_key_quark);
if (!mateconf_key) if (!key)
continue; continue;
key = mateconf_concat_dir_and_key (priv->profile_dir, mateconf_key); terminal_profile_gsettings_notify_cb (priv->settings, key, profile);
mateconf_client_notify (priv->conf, key);
g_free (key);
} }
g_free (pspecs); g_free (pspecs);
@ -1039,8 +983,9 @@ terminal_profile_finalize (GObject *object)
TerminalProfile *profile = TERMINAL_PROFILE (object); TerminalProfile *profile = TERMINAL_PROFILE (object);
TerminalProfilePrivate *priv = profile->priv; TerminalProfilePrivate *priv = profile->priv;
mateconf_client_notify_remove (priv->conf, priv->notify_id); g_signal_handlers_disconnect_by_func (priv->settings,
priv->notify_id = 0; G_CALLBACK(terminal_profile_gsettings_notify_cb),
profile);
if (priv->save_idle_id) if (priv->save_idle_id)
{ {
@ -1052,7 +997,7 @@ terminal_profile_finalize (GObject *object)
_terminal_profile_forget (profile); _terminal_profile_forget (profile);
g_object_unref (priv->conf); g_object_unref (priv->settings);
g_free (priv->profile_dir); g_free (priv->profile_dir);
g_free (priv->locked); g_free (priv->locked);
@ -1142,18 +1087,19 @@ terminal_profile_set_property (GObject *object,
const char *name = g_value_get_string (value); const char *name = g_value_get_string (value);
g_assert (name != NULL); g_assert (name != NULL);
priv->profile_dir = mateconf_concat_dir_and_key (CONF_PROFILES_PREFIX, name); priv->profile_dir = g_strdup (name);
if (priv->settings != NULL) {
mateconf_client_add_dir (priv->conf, priv->profile_dir, g_signal_handlers_disconnect_by_func (priv->settings,
MATECONF_CLIENT_PRELOAD_ONELEVEL, G_CALLBACK(terminal_profile_gsettings_notify_cb),
NULL); profile);
priv->notify_id = g_object_unref (priv->settings);
mateconf_client_notify_add (priv->conf, priv->settings = g_settings_new_with_path (CONF_PROFILE_SCHEMA,
priv->profile_dir, g_strconcat (CONF_PROFILE_PREFIX, priv->profile_dir, "/", NULL));
terminal_profile_mateconf_notify_cb, g_signal_connect (priv->settings,
profile, NULL, g_strconcat("changed::", priv->profile_dir, "/", NULL),
NULL); G_CALLBACK(terminal_profile_gsettings_notify_cb),
profile);
}
break; break;
} }
@ -1185,8 +1131,8 @@ terminal_profile_notify (GObject *object,
if (pspec->owner_type == TERMINAL_TYPE_PROFILE && if (pspec->owner_type == TERMINAL_TYPE_PROFILE &&
(pspec->flags & G_PARAM_WRITABLE) && (pspec->flags & G_PARAM_WRITABLE) &&
g_param_spec_get_qdata (pspec, mateconf_key_quark) != NULL && g_param_spec_get_qdata (pspec, gsettings_key_quark) != NULL &&
pspec != priv->mateconf_notification_pspec) pspec != priv->gsettings_notification_pspec)
terminal_profile_schedule_save (TERMINAL_PROFILE (object), pspec); terminal_profile_schedule_save (TERMINAL_PROFILE (object), pspec);
} }
@ -1195,7 +1141,7 @@ terminal_profile_class_init (TerminalProfileClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
mateconf_key_quark = g_quark_from_static_string ("GT::MateConfKey"); gsettings_key_quark = g_quark_from_static_string ("GT::GSettingsKey");
g_type_class_add_private (object_class, sizeof (TerminalProfilePrivate)); g_type_class_add_private (object_class, sizeof (TerminalProfilePrivate));
@ -1214,88 +1160,88 @@ terminal_profile_class_init (TerminalProfileClass *klass)
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/* mateconf_key -> pspec hash */ /* gsettings_key -> pspec hash */
klass->mateconf_keys = g_hash_table_new (g_str_hash, g_str_equal); klass->gsettings_keys = g_hash_table_new (g_str_hash, g_str_equal);
#define TERMINAL_PROFILE_PSPEC_STATIC (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) #define TERMINAL_PROFILE_PSPEC_STATIC (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
#define TERMINAL_PROFILE_PROPERTY(propId, propSpec, propMateConf) \ #define TERMINAL_PROFILE_PROPERTY(propId, propSpec, propGSettings) \
{\ {\
GParamSpec *pspec = propSpec;\ GParamSpec *pspec = propSpec;\
g_object_class_install_property (object_class, propId, pspec);\ g_object_class_install_property (object_class, propId, pspec);\
\ \
if (propMateConf)\ if (propGSettings)\
{\ {\
g_param_spec_set_qdata (pspec, mateconf_key_quark, (gpointer) propMateConf);\ g_param_spec_set_qdata (pspec, gsettings_key_quark, (gpointer) propGSettings);\
g_hash_table_insert (klass->mateconf_keys, (gpointer) propMateConf, pspec);\ g_hash_table_insert (klass->gsettings_keys, (gpointer) propGSettings, pspec);\
}\ }\
} }
#define TERMINAL_PROFILE_PROPERTY_BOOLEAN(prop, propDefault, propMateConf) \ #define TERMINAL_PROFILE_PROPERTY_BOOLEAN(prop, propDefault, propGSettings) \
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_boolean (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_boolean (TERMINAL_PROFILE_##prop, NULL, NULL,\
propDefault,\ propDefault,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_BOXED(prop, propType, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_BOXED(prop, propType, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_boxed (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_boxed (TERMINAL_PROFILE_##prop, NULL, NULL,\
propType,\ propType,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_DOUBLE(prop, propMin, propMax, propDefault, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_DOUBLE(prop, propMin, propMax, propDefault, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_double (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_double (TERMINAL_PROFILE_##prop, NULL, NULL,\
propMin, propMax, propDefault,\ propMin, propMax, propDefault,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_ENUM(prop, propType, propDefault, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_ENUM(prop, propType, propDefault, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_enum (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_enum (TERMINAL_PROFILE_##prop, NULL, NULL,\
propType, propDefault,\ propType, propDefault,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_INT(prop, propMin, propMax, propDefault, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_INT(prop, propMin, propMax, propDefault, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_int (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_int (TERMINAL_PROFILE_##prop, NULL, NULL,\
propMin, propMax, propDefault,\ propMin, propMax, propDefault,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
/* these are all read-only */ /* these are all read-only */
#define TERMINAL_PROFILE_PROPERTY_OBJECT(prop, propType, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_OBJECT(prop, propType, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_object (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_object (TERMINAL_PROFILE_##prop, NULL, NULL,\
propType,\ propType,\
G_PARAM_READABLE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READABLE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_STRING(prop, propDefault, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_STRING(prop, propDefault, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_string (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_string (TERMINAL_PROFILE_##prop, NULL, NULL,\
propDefault,\ propDefault,\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_STRING_CO(prop, propDefault, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_STRING_CO(prop, propDefault, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_string (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_string (TERMINAL_PROFILE_##prop, NULL, NULL,\
propDefault,\ propDefault,\
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
#define TERMINAL_PROFILE_PROPERTY_VALUE_ARRAY_BOXED(prop, propElementName, propElementType, propMateConf)\ #define TERMINAL_PROFILE_PROPERTY_VALUE_ARRAY_BOXED(prop, propElementName, propElementType, propGSettings)\
TERMINAL_PROFILE_PROPERTY (PROP_##prop,\ TERMINAL_PROFILE_PROPERTY (PROP_##prop,\
g_param_spec_value_array (TERMINAL_PROFILE_##prop, NULL, NULL,\ g_param_spec_value_array (TERMINAL_PROFILE_##prop, NULL, NULL,\
g_param_spec_boxed (propElementName, NULL, NULL,\ g_param_spec_boxed (propElementName, NULL, NULL,\
propElementType, \ propElementType, \
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\ G_PARAM_READWRITE | TERMINAL_PROFILE_PSPEC_STATIC),\
propMateConf) propGSettings)
TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALLOW_BOLD, DEFAULT_ALLOW_BOLD, KEY_ALLOW_BOLD); TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALLOW_BOLD, DEFAULT_ALLOW_BOLD, KEY_ALLOW_BOLD);
TERMINAL_PROFILE_PROPERTY_BOOLEAN (BOLD_COLOR_SAME_AS_FG, DEFAULT_BOLD_COLOR_SAME_AS_FG, KEY_BOLD_COLOR_SAME_AS_FG); TERMINAL_PROFILE_PROPERTY_BOOLEAN (BOLD_COLOR_SAME_AS_FG, DEFAULT_BOLD_COLOR_SAME_AS_FG, KEY_BOLD_COLOR_SAME_AS_FG);
@ -1363,10 +1309,6 @@ _terminal_profile_forget (TerminalProfile *profile)
if (!priv->forgotten) if (!priv->forgotten)
{ {
mateconf_client_remove_dir (priv->conf,
priv->profile_dir,
NULL);
priv->forgotten = TRUE; priv->forgotten = TRUE;
g_signal_emit (G_OBJECT (profile), signals[FORGOTTEN], 0); g_signal_emit (G_OBJECT (profile), signals[FORGOTTEN], 0);
@ -1397,7 +1339,7 @@ _terminal_profile_clone (TerminalProfile *base_profile,
profile_num = 0; profile_num = 0;
do do
{ {
g_snprintf (profile_name, sizeof (profile_name), "Profile%u", profile_num++); g_snprintf (profile_name, sizeof (profile_name), "profile%u", profile_num++);
} }
while (terminal_app_get_profile_by_name (app, profile_name) != NULL); while (terminal_app_get_profile_by_name (app, profile_name) != NULL);
@ -1439,7 +1381,7 @@ _terminal_profile_clone (TerminalProfile *base_profile,
for (i = 0; i < n_params; ++i) for (i = 0; i < n_params; ++i)
g_value_unset (&params[i].value); g_value_unset (&params[i].value);
/* Flush the new profile to mateconf */ /* Flush the new profile to GSettings */
new_priv = new_profile->priv; new_priv = new_profile->priv;
g_slist_free (new_priv->dirty_pspecs); g_slist_free (new_priv->dirty_pspecs);

2
src/terminal-profile.h
View File

@ -131,7 +131,7 @@ struct _TerminalProfileClass
void (* forgotten) (TerminalProfile *profile); void (* forgotten) (TerminalProfile *profile);
GHashTable *mateconf_keys; GHashTable *gsettings_keys;
}; };
GType terminal_profile_get_type (void); GType terminal_profile_get_type (void);

64
src/terminal-util.c
View File

@ -32,8 +32,6 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <mateconf/mateconf.h>
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
@ -527,11 +525,11 @@ terminal_util_key_file_get_argv (GKeyFile *key_file,
/* Proxy stuff */ /* Proxy stuff */
static char * static char *
conf_get_string (MateConfClient *conf, gsettings_get_string (GSettings *settings,
const char *key) const char *key)
{ {
char *value; char *value;
value = mateconf_client_get_string (conf, key, NULL); value = g_settings_get_string (settings, key);
if (G_UNLIKELY (value && *value == '\0')) if (G_UNLIKELY (value && *value == '\0'))
{ {
g_free (value); g_free (value);
@ -590,30 +588,30 @@ set_proxy_env (GHashTable *env_table,
static void static void
setup_http_proxy_env (GHashTable *env_table, setup_http_proxy_env (GHashTable *env_table,
MateConfClient *conf) GSettings *settings_http)
{ {
gchar *host; gchar *host;
gint port; gint port;
GSList *ignore; GSList *ignore;
if (!mateconf_client_get_bool (conf, CONF_HTTP_PROXY_PREFIX "/use_http_proxy", NULL)) if (!g_settings_get_boolean (settings_http, "use-http-proxy"))
return; return;
host = conf_get_string (conf, CONF_HTTP_PROXY_PREFIX "/host"); host = gsettings_get_string (settings_http, "host");
port = mateconf_client_get_int (conf, CONF_HTTP_PROXY_PREFIX "/port", NULL); port = g_settings_get_int (settings_http, "port");
if (host && port) if (host && port)
{ {
GString *buf = g_string_sized_new (64); GString *buf = g_string_sized_new (64);
g_string_append (buf, "http://"); g_string_append (buf, "http://");
if (mateconf_client_get_bool (conf, CONF_HTTP_PROXY_PREFIX "/use_authentication", NULL)) if (g_settings_get_boolean (settings_http, "use-authentication"))
{ {
char *user, *password; char *user, *password;
user = conf_get_string (conf, CONF_HTTP_PROXY_PREFIX "/authentication_user"); user = gsettings_get_string (settings_http, "authentication-user");
if (user) if (user)
{ {
g_string_append_uri_escaped (buf, user, NULL, TRUE); g_string_append_uri_escaped (buf, user, NULL, TRUE);
password = conf_get_string (conf, CONF_HTTP_PROXY_PREFIX "/authentication_password"); password = gsettings_get_string (settings_http, "authentication-password");
if (password) if (password)
{ {
g_string_append_c (buf, ':'); g_string_append_c (buf, ':');
@ -629,7 +627,7 @@ setup_http_proxy_env (GHashTable *env_table,
} }
g_free (host); g_free (host);
ignore = mateconf_client_get_list (conf, CONF_HTTP_PROXY_PREFIX "/ignore_hosts", MATECONF_VALUE_STRING, NULL); ignore = terminal_gsettings_strv_to_gslist (g_settings_get_strv (settings_http, "ignore-hosts"));
if (ignore) if (ignore)
{ {
GString *buf = g_string_sized_new (64); GString *buf = g_string_sized_new (64);
@ -652,13 +650,13 @@ setup_http_proxy_env (GHashTable *env_table,
static void static void
setup_https_proxy_env (GHashTable *env_table, setup_https_proxy_env (GHashTable *env_table,
MateConfClient *conf) GSettings *settings)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = conf_get_string (conf, CONF_PROXY_PREFIX "/secure_host"); host = gsettings_get_string (settings, "secure-host");
port = mateconf_client_get_int (conf, CONF_PROXY_PREFIX "/secure_port", NULL); port = g_settings_get_int (settings, "secure-port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -671,13 +669,13 @@ setup_https_proxy_env (GHashTable *env_table,
static void static void
setup_ftp_proxy_env (GHashTable *env_table, setup_ftp_proxy_env (GHashTable *env_table,
MateConfClient *conf) GSettings *settings)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = conf_get_string (conf, CONF_PROXY_PREFIX "/ftp_host"); host = gsettings_get_string (settings, "ftp-host");
port = mateconf_client_get_int (conf, CONF_PROXY_PREFIX "/ftp_port", NULL); port = g_settings_get_int (settings, "ftp-port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -690,13 +688,13 @@ setup_ftp_proxy_env (GHashTable *env_table,
static void static void
setup_socks_proxy_env (GHashTable *env_table, setup_socks_proxy_env (GHashTable *env_table,
MateConfClient *conf) GSettings *settings)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = conf_get_string (conf, CONF_PROXY_PREFIX "/socks_host"); host = gsettings_get_string (settings, "socks-host");
port = mateconf_client_get_int (conf, CONF_PROXY_PREFIX "/socks_port", NULL); port = g_settings_get_int (settings, "socks-port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -708,12 +706,12 @@ setup_socks_proxy_env (GHashTable *env_table,
static void static void
setup_autoconfig_proxy_env (GHashTable *env_table, setup_autoconfig_proxy_env (GHashTable *env_table,
MateConfClient *conf) GSettings *settings)
{ {
/* XXX Not sure what to do with this. See bug #596688. /* XXX Not sure what to do with this. See bug #596688.
gchar *url; gchar *url;
url = conf_get_string (conf, CONF_PROXY_PREFIX "/autoconfig_url"); url = gsettings_get_string (settings, "autoconfig-url");
if (url) if (url)
{ {
char *proxy; char *proxy;
@ -735,25 +733,27 @@ terminal_util_add_proxy_env (GHashTable *env_table)
{ {
char *proxymode; char *proxymode;
MateConfClient *conf; GSettings *settings, *settings_http;
conf = mateconf_client_get_default (); settings = g_settings_new (CONF_PROXY_SCHEMA);
settings_http = g_settings_new (CONF_HTTP_PROXY_SCHEMA);
/* If mode is not manual, nothing to set */ /* If mode is not manual, nothing to set */
proxymode = conf_get_string (conf, CONF_PROXY_PREFIX "/mode"); proxymode = gsettings_get_string (settings, "mode");
if (proxymode && 0 == strcmp (proxymode, "manual")) if (proxymode && 0 == strcmp (proxymode, "manual"))
{ {
setup_http_proxy_env (env_table, conf); setup_http_proxy_env (env_table, settings_http);
setup_https_proxy_env (env_table, conf); setup_https_proxy_env (env_table, settings);
setup_ftp_proxy_env (env_table, conf); setup_ftp_proxy_env (env_table, settings);
setup_socks_proxy_env (env_table, conf); setup_socks_proxy_env (env_table, settings);
} }
else if (proxymode && 0 == strcmp (proxymode, "auto")) else if (proxymode && 0 == strcmp (proxymode, "auto"))
{ {
setup_autoconfig_proxy_env (env_table, conf); setup_autoconfig_proxy_env (env_table, settings);
} }
g_free (proxymode); g_free (proxymode);
g_object_unref (conf); g_object_unref (settings);
g_object_unref (settings_http);
} }
/* Bidirectional object/widget binding */ /* Bidirectional object/widget binding */

5
src/terminal-util.h
View File

@ -22,14 +22,13 @@
#define TERMINAL_UTIL_H #define TERMINAL_UTIL_H
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <mateconf/mateconf-client.h>
#include "terminal-screen.h" #include "terminal-screen.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define CONF_PROXY_PREFIX "/system/proxy" #define CONF_PROXY_SCHEMA "org.gnome.system.proxy"
#define CONF_HTTP_PROXY_PREFIX "/system/http_proxy" #define CONF_HTTP_PROXY_SCHEMA "org.gnome.system.proxy.http"
void terminal_util_set_unique_role (GtkWindow *window, const char *prefix); void terminal_util_set_unique_role (GtkWindow *window, const char *prefix);

8
src/terminal-window.c
View File

@ -3204,7 +3204,7 @@ confirm_close_window_or_tab (TerminalWindow *window,
{ {
TerminalWindowPrivate *priv = window->priv; TerminalWindowPrivate *priv = window->priv;
GtkWidget *dialog; GtkWidget *dialog;
MateConfClient *client; GSettings *settings;
gboolean do_confirm; gboolean do_confirm;
int n_tabs; int n_tabs;
@ -3215,9 +3215,9 @@ confirm_close_window_or_tab (TerminalWindow *window,
GTK_RESPONSE_DELETE_EVENT); GTK_RESPONSE_DELETE_EVENT);
} }
client = mateconf_client_get_default (); settings = g_settings_new (CONF_GLOBAL_SCHEMA);
do_confirm = mateconf_client_get_bool (client, CONF_GLOBAL_PREFIX "/confirm_window_close", NULL); do_confirm = g_settings_get_boolean (settings, "confirm-window-close");
g_object_unref (client); g_object_unref (settings);
if (!do_confirm) if (!do_confirm)
return FALSE; return FALSE;

7
src/terminal.c
View File

@ -409,7 +409,7 @@ name_lost_cb (GDBusConnection *connection,
* /apps/mate-terminal/profiles/Foo/ * /apps/mate-terminal/profiles/Foo/
* *
* It's somewhat tricky to manage the profiles/ dir since we need to track * It's somewhat tricky to manage the profiles/ dir since we need to track
* the list of profiles, but mateconf doesn't have a concept of notifying that * the list of profiles, but GSettings doesn't have a concept of notifying that
* a directory has appeared or disappeared. * a directory has appeared or disappeared.
* *
* Session state is stored entirely in the RestartCommand command line. * Session state is stored entirely in the RestartCommand command line.
@ -419,7 +419,7 @@ name_lost_cb (GDBusConnection *connection,
* OVERLAP. The UI and implementation totally break if you overlap * OVERLAP. The UI and implementation totally break if you overlap
* these categories. See mate-terminal 1.x for why. * these categories. See mate-terminal 1.x for why.
* *
* Don't use this code as an example of how to use MateConf - it's hugely * Don't use this code as an example of how to use GSettings - it's hugely
* overcomplicated due to the profiles stuff. Most apps should not * overcomplicated due to the profiles stuff. Most apps should not
* have to do scary things of this nature, and should not have * have to do scary things of this nature, and should not have
* a profiles feature. * a profiles feature.
@ -519,9 +519,6 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
/* MateConf uses MateCORBA2 which need GThread. See bug #565516 */
g_thread_init (NULL);
_terminal_debug_init (); _terminal_debug_init ();
/* Make a NULL-terminated copy since we may need it later */ /* Make a NULL-terminated copy since we may need it later */