[Xfce4-commits] <terminal:master> Remove the exo dependency.
Nick Schermer
noreply at xfce.org
Thu Dec 20 22:16:04 CET 2012
Updating branch refs/heads/master
to 3610a76a4791f4b0c00c25b0ee2bd323fd8c7000 (commit)
from 2db4bcb21cd06f56c89ce858fd7cebc97053fe53 (commit)
commit 3610a76a4791f4b0c00c25b0ee2bd323fd8c7000
Author: Nick Schermer <nick at xfce.org>
Date: Thu Dec 20 22:14:54 2012 +0100
Remove the exo dependency.
configure.ac.in | 1 -
terminal/Makefile.am | 7 +-
terminal/main.c | 2 -
terminal/terminal-app.c | 41 +++----
terminal/terminal-app.h | 3 +-
terminal/terminal-encoding-action.c | 2 +-
terminal/terminal-image-loader.c | 2 +-
terminal/terminal-preferences-dialog.c | 20 ++--
terminal/terminal-preferences-dialog.h | 2 -
terminal/terminal-preferences.c | 186 ++++++++++++++++----------------
terminal/terminal-preferences.h | 3 +-
terminal/terminal-private.h | 2 +
terminal/terminal-screen.c | 22 +++--
terminal/terminal-shortcut-editor.c | 6 +-
terminal/terminal-widget.c | 6 +-
terminal/terminal-window.c | 25 +++--
16 files changed, 163 insertions(+), 167 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index ae25a5e..26ccee8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -81,7 +81,6 @@ XDT_CHECK_LIBX11()
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.10.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
XDT_CHECK_PACKAGE([VTE], [vte], [0.28])
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.26.0])
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 76191f7..4e58f82 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES = \
-I$(top_srcdir) \
-DDATADIR=\"$(datadir)\" \
-DHELPDIR=\"$(docdir)\" \
- -DEXO_DISABLE_DEPRECATED\
-DG_LOG_DOMAIN=\"xfce4-terminal\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
@@ -52,7 +51,6 @@ xfce4_terminal_SOURCES = \
terminal-window.c
xfce4_terminal_CFLAGS = \
- $(EXO_CFLAGS) \
$(GTK_CFLAGS) \
$(GIO_CFLAGS) \
$(LIBX11_CFLAGS)\
@@ -65,7 +63,6 @@ xfce4_terminal_LDFLAGS = \
$(PLATFORM_LDFLAGS)
xfce4_terminal_LDADD = \
- $(EXO_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS) \
$(LIBX11_LDFLAGS) \
@@ -103,13 +100,13 @@ BUILT_SOURCES = \
$(xfce4_terminal_built_sources)
terminal-window-ui.h: Makefile $(srcdir)/terminal-window-ui.xml
- $(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=terminal_window_ui $(srcdir)/terminal-window-ui.xml > terminal-window-ui.h
+ $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=terminal_window_ui $(srcdir)/terminal-window-ui.xml > terminal-window-ui.h
terminal-enum-types.h: stamp-terminal-enum-types.h
@true
stamp-terminal-enum-types.h: terminal-preferences.h Makefile
$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
- --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <exo/exo.h>\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name at _get_type (void);\n#define TERMINAL_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* !__TERMINAL_ENUM_TYPES_H__ */" \
diff --git a/terminal/main.c b/terminal/main.c
index 65118a3..df9fa31 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -27,8 +27,6 @@
#endif
#include <stdlib.h>
-#include <exo/exo.h>
-
#include <terminal/terminal-app.h>
#include <terminal/terminal-private.h>
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 0d5a00e..03d26d3 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -63,7 +63,7 @@ static void terminal_app_new_window_with_terminal (TerminalWindow
TerminalApp *app);
static void terminal_app_window_destroyed (GtkWidget *window,
TerminalApp *app);
-static void terminal_app_save_yourself (ExoXsessionClient *client,
+static void terminal_app_save_yourself (XfceSMClient *client,
TerminalApp *app);
static GdkScreen *terminal_app_find_screen (const gchar *display_name);
static void terminal_app_open_window (TerminalApp *app,
@@ -81,7 +81,7 @@ struct _TerminalApp
GObject __parent__;
TerminalPreferences *preferences;
TerminalAccelMap *accel_map;
- ExoXsessionClient *session_client;
+ XfceSMClient *session_client;
gchar *initial_menu_bar_accel;
GSList *windows;
};
@@ -326,15 +326,15 @@ terminal_app_window_destroyed (GtkWidget *window,
static void
-terminal_app_save_yourself (ExoXsessionClient *client,
- TerminalApp *app)
+terminal_app_save_yourself (XfceSMClient *client,
+ TerminalApp *app)
{
- GSList *result = NULL;
- GSList *lp;
- gchar **oargv;
- gchar **argv;
- gint argc;
- gint n;
+ GSList *result = NULL;
+ GSList *lp;
+ const gchar * const *oargv;
+ gchar **argv;
+ gint argc;
+ gint n;
for (lp = app->windows; lp != NULL; lp = lp->next)
{
@@ -349,22 +349,19 @@ terminal_app_save_yourself (ExoXsessionClient *client,
argv[n] = lp->data;
argv[n] = NULL;
- if (exo_xsession_client_get_restart_command (client, &oargv, NULL))
+ oargv = xfce_sm_client_get_restart_command (client);
+ if (oargv != NULL)
{
terminal_assert (oargv[0] != NULL);
- argv[0] = oargv[0];
-
- for (n = 1; oargv[n] != NULL; ++n)
- g_free (oargv[n]);
- g_free (oargv);
+ argv[0] = g_strdup (oargv[0]);
}
else
{
- argv[0] = g_strdup ("Terminal");
+ argv[0] = g_strdup (PACKAGE_NAME);
}
- exo_xsession_client_set_restart_command (client, argv, argc);
+ xfce_sm_client_set_restart_command (client, argv);
g_slist_free (result);
g_strfreev (argv);
@@ -446,8 +443,6 @@ terminal_app_open_window (TerminalApp *app,
TerminalWindowAttr *attr)
{
TerminalTabAttr *tab_attr;
- GdkDisplay *display;
- GdkWindow *leader;
GtkWidget *window;
GtkWidget *terminal;
GdkScreen *screen;
@@ -528,10 +523,8 @@ terminal_app_open_window (TerminalApp *app,
*/
if (G_UNLIKELY (app->session_client == NULL))
{
- display = gtk_widget_get_display (GTK_WIDGET (window));
- leader = gdk_display_get_default_group (display);
- app->session_client = exo_xsession_client_new_with_group (leader);
- g_signal_connect (G_OBJECT (app->session_client), "save-yourself",
+ app->session_client = xfce_sm_client_get ();
+ g_signal_connect (G_OBJECT (app->session_client), "save-state",
G_CALLBACK (terminal_app_save_yourself), app);
}
}
diff --git a/terminal/terminal-app.h b/terminal/terminal-app.h
index 0971c81..10cc735 100644
--- a/terminal/terminal-app.h
+++ b/terminal/terminal-app.h
@@ -21,7 +21,8 @@
#ifndef __TERMINAL_APP_H__
#define __TERMINAL_APP_H__
-#include <exo/exo.h>
+#include <gtk/gtk.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <terminal/terminal-options.h>
diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c
index 3a6be6b..602c590 100644
--- a/terminal/terminal-encoding-action.c
+++ b/terminal/terminal-encoding-action.c
@@ -152,7 +152,7 @@ terminal_encoding_action_class_init (TerminalEncodingActionClass *klass)
encoding_action_quark = g_quark_from_static_string ("encoding-action-quark");
encoding_action_signals[ENCODING_CHANGED] =
- g_signal_new ("encoding-changed",
+ g_signal_new (I_("encoding-changed"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
diff --git a/terminal/terminal-image-loader.c b/terminal/terminal-image-loader.c
index f01d8c8..d3530fc 100644
--- a/terminal/terminal-image-loader.c
+++ b/terminal/terminal-image-loader.c
@@ -135,7 +135,7 @@ terminal_image_loader_check (TerminalImageLoader *loader)
"color-background", &selected_color_spec,
NULL);
- if (!exo_str_is_equal (selected_path, loader->path))
+ if (g_strcmp0 (selected_path, loader->path) != 0)
{
g_free (loader->path);
loader->path = g_strdup (selected_path);
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 0dbd979..fdbcf83 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -72,8 +72,9 @@ terminal_preferences_dialog_class_init (TerminalPreferencesDialogClass *klass)
G_STMT_START { \
object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
terminal_return_if_fail (G_IS_OBJECT (object)); \
- binding = exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
- G_OBJECT (object), property); \
+ binding = g_object_bind_property (G_OBJECT (dialog->preferences), name, \
+ G_OBJECT (object), property, \
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); \
dialog->bindings = g_slist_prepend (dialog->bindings, binding); \
} G_STMT_END
@@ -89,7 +90,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
gchar palette_name[16];
GtkFileFilter *filter;
gchar *file;
- ExoMutualBinding *binding;
+ GBinding *binding;
GtkTreeModel *model;
gchar *current;
GtkTreeIter current_iter;
@@ -187,15 +188,18 @@ error:
/* inverted action between cursor color selections */
object = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-use-color");
terminal_return_if_fail (G_IS_OBJECT (object));
- exo_binding_new_with_negation (G_OBJECT (dialog->preferences), "color-selection-use-default",
- G_OBJECT (object), "active");
+ g_object_bind_property (G_OBJECT (dialog->preferences), "color-selection-use-default",
+ G_OBJECT (object), "active",
+ G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE);
/* sensitivity for custom selection color */
object = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-use-color");
terminal_return_if_fail (G_IS_OBJECT (object));
object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection");
terminal_return_if_fail (G_IS_OBJECT (object2));
- exo_binding_new (G_OBJECT (object), "active", G_OBJECT (object2), "sensitive");
+ g_object_bind_property (G_OBJECT (object), "active",
+ G_OBJECT (object2), "sensitive",
+ G_BINDING_SYNC_CREATE);
/* background widgets visibility */
object = gtk_builder_get_object (GTK_BUILDER (dialog), "background-mode");
@@ -275,7 +279,7 @@ terminal_preferences_dialog_response (GtkWidget *widget,
{
/* disconnect all the bindings */
for (li = dialog->bindings; li != NULL; li = li->next)
- exo_mutual_binding_unbind (li->data);
+ g_object_unref (G_OBJECT (li->data));
g_slist_free (dialog->bindings);
/* close the preferences dialog */
@@ -364,7 +368,7 @@ terminal_preferences_dialog_background_notify (GObject *object,
button_file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
g_object_get (G_OBJECT (object), "background-image-file", &prop_file, NULL);
- if (!exo_str_is_equal (button_file, prop_file))
+ if (g_strcmp0 (button_file, prop_file) != 0)
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), prop_file);
g_free (button_file);
g_free (prop_file);
diff --git a/terminal/terminal-preferences-dialog.h b/terminal/terminal-preferences-dialog.h
index 268d70a..f255067 100644
--- a/terminal/terminal-preferences-dialog.h
+++ b/terminal/terminal-preferences-dialog.h
@@ -21,8 +21,6 @@
#ifndef __TERMINAL_PREFERENCES_DIALOG_H__
#define __TERMINAL_PREFERENCES_DIALOG_H__
-#include <exo/exo.h>
-
#include <terminal/terminal-preferences.h>
G_BEGIN_DECLS
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 57c7caa..e54cb33 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -197,7 +197,7 @@ static void
transform_string_to_boolean (const GValue *src,
GValue *dst)
{
- g_value_set_boolean (dst, !exo_str_is_equal (g_value_get_string (src), "FALSE"));
+ g_value_set_boolean (dst, g_strcmp0 (g_value_get_string (src), "FALSE") != 0);
}
@@ -311,7 +311,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Open Tab",
"AccelNewTab",
"<Shift><Control>t",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-new-window:
@@ -321,7 +321,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Open Terminal",
"AccelNewWindow",
"<Shift><Control>n",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-detach-tab:
@@ -331,7 +331,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Detach Tab",
"AccelDetachTab",
"<Shift><Control>d",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-close-tab:
@@ -341,7 +341,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Close Tab",
"AccelCloseTab",
"<Shift><Control>w",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-close-window:
@@ -351,7 +351,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Close Window",
"AccelCloseWindow",
"<Shift><Control>q",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-copy:
@@ -361,7 +361,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Copy",
"AccelCopy",
"<Shift><Control>c",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-paste:
@@ -371,7 +371,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Paste",
"AccelPaste",
"<Shift><Control>v",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-paste-selection:
@@ -381,7 +381,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Paste Selection",
"AccelPasteSelection",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-select-all:
@@ -391,7 +391,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Select All",
"AccelSelectAll",
"<Shift><Control>a",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-preferences:
@@ -401,7 +401,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Preferences",
"AccelPreferences",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-show-menubar:
@@ -411,7 +411,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Show menubar",
"AccelShowMenubar",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-show-toolbars:
@@ -421,7 +421,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Show toolbars",
"AccelShowToolbars",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-show-borders:
@@ -431,7 +431,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Show borders",
"AccelShowBorders",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-fullscreen:
@@ -441,7 +441,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Fullscreen",
"AccelFullscreen",
"F11",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-set-title:
@@ -451,7 +451,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Set Title",
"AccelSetTitle",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-reset:
@@ -461,7 +461,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Reset",
"AccelReset",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-reset-and-clear:
@@ -471,7 +471,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Reset and Clear",
"AccelResetAndClear",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-prev-tab:
@@ -481,7 +481,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Previous Tab",
"AccelPrevTab",
"<Control>Page_Up",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-next-tab:
@@ -491,7 +491,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Next Tab",
"AccelNextTab",
"<Control>Page_Down",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab1:
@@ -501,7 +501,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 1",
"AccelSwitchToTab1",
"<Alt>1",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab2:
@@ -511,7 +511,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 2",
"AccelSwitchToTab2",
"<Alt>2",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab3:
@@ -521,7 +521,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 3",
"AccelSwitchToTab3",
"<Alt>3",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab4:
@@ -531,7 +531,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 4",
"AccelSwitchToTab4",
"<Alt>4",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab5:
@@ -541,7 +541,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 5",
"AccelSwitchToTab5",
"<Alt>5",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab6:
@@ -551,7 +551,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 6",
"AccelSwitchToTab6",
"<Alt>6",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab7:
@@ -561,7 +561,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 7",
"AccelSwitchToTab7",
"<Alt>7",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab8:
@@ -571,7 +571,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 8",
"AccelSwitchToTab8",
"<Alt>8",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-switch-to-tab9:
@@ -581,7 +581,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Switch to Tab 9",
"AccelSwitchToTab9",
"<Alt>9",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:accel-contents:
@@ -591,7 +591,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"Contents",
"AccelContents",
"F1",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:background-mode:
@@ -602,7 +602,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"BackgroundMode",
TERMINAL_TYPE_BACKGROUND,
TERMINAL_BACKGROUND_SOLID,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:background-image-file:
@@ -612,7 +612,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"background-image-file",
"BackgroundImageFile",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:background-image-style:
@@ -623,7 +623,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"BackgroundImageStyle",
TERMINAL_TYPE_BACKGROUND_STYLE,
TERMINAL_BACKGROUND_STYLE_TILED,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:background-darkness:
@@ -638,7 +638,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"background-darkness",
"BackgroundDarkness",
0.0, 1.0, 0.5,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:binding-backspace:
@@ -649,7 +649,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"BindingBackspace",
TERMINAL_TYPE_ERASE_BINDING,
TERMINAL_ERASE_BINDING_AUTO,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:binding-delete:
@@ -660,7 +660,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"BindingDelete",
TERMINAL_TYPE_ERASE_BINDING,
TERMINAL_ERASE_BINDING_AUTO,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-foreground:
@@ -670,7 +670,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-foreground",
"ColorForeground",
"#ffffffffffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-background:
@@ -680,7 +680,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-background",
"ColorBackground",
"#000000000000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-cursor:
@@ -690,7 +690,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-cursor",
"ColorCursor",
"#0000ffff0000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-selection:
@@ -700,7 +700,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-selection",
"ColorSelection",
"#ffffffffffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-selection-use-default:
@@ -710,7 +710,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-selection-use-default",
"ColorSelectionUseDefault",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette1:
@@ -720,7 +720,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette1",
"ColorPalette1",
"#000000000000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette2:
@@ -730,7 +730,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette2",
"ColorPalette2",
"#aaaa00000000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette3:
@@ -740,7 +740,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette3",
"ColorPalette3",
"#0000aaaa0000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette4:
@@ -750,7 +750,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette4",
"ColorPalette4",
"#aaaa55550000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette5:
@@ -760,7 +760,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette5",
"ColorPalette5",
"#00000000aaaa",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette6:
@@ -770,7 +770,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette6",
"ColorPalette6",
"#aaaa0000aaaa",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette7:
@@ -780,7 +780,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette7",
"ColorPalette7",
"#0000aaaaaaaa",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette8:
@@ -790,7 +790,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette8",
"ColorPalette8",
"#aaaaaaaaaaaa",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette9:
@@ -800,7 +800,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette9",
"ColorPalette9",
"#555555555555",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette10:
@@ -810,7 +810,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette10",
"ColorPalette10",
"#ffff55555555",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette11:
@@ -820,7 +820,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette11",
"ColorPalette11",
"#5555ffff5555",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette12:
@@ -830,7 +830,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette12",
"ColorPalette12",
"#ffffffff5555",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette13:
@@ -840,7 +840,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette13",
"ColorPalette13",
"#55555555ffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette14:
@@ -850,7 +850,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette14",
"ColorPalette14",
"#ffff5555ffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette15:
@@ -860,7 +860,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette15",
"ColorPalette15",
"#5555ffffffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:color-palette16:
@@ -870,7 +870,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"color-palette16",
"ColorPalette16",
"#ffffffffffff",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:tab-activity-color:
@@ -880,7 +880,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"tab-activity-color",
"TabActivityColor",
"#afff00000000",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:tab-activity-timeout:
@@ -890,7 +890,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"tab-activity-timeout",
"TabActivityTimeout",
0, 30, 2,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:command-update-records:
@@ -900,7 +900,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"command-update-records",
"CommandUpdateRecords",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:command-login-shell:
@@ -910,7 +910,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"command-login-shell",
"CommandLoginShell",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:encoding:
@@ -920,7 +920,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"encodinge",
"Encoding",
NULL,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:font-allow-bold:
@@ -930,7 +930,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"font-allow-bold",
"FontAllowBold",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:font-name:
@@ -940,7 +940,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"font-name",
"FontName",
"Monospace 12",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-always-show-tabs:
@@ -950,7 +950,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-always-show-tabs",
"MiscAlwaysShowTabs",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-bell:
@@ -960,7 +960,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-bell",
"MiscBell",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-borders-default:
@@ -970,7 +970,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-borders-default",
"MiscBordersDefault",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-cursor-blinks:
@@ -980,7 +980,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-cursor-blinks",
"MiscCursorBlinks",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-cursor-shape:
@@ -991,7 +991,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"MiscCursorShape",
TERMINAL_TYPE_CURSOR_SHAPE,
TERMINAL_CURSOR_SHAPE_BLOCK,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-default-geometry:
@@ -1001,7 +1001,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-default-geometry",
"MiscDefaultGeometry",
"80x24",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-inherit-geometry:
@@ -1011,7 +1011,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-inherit-geometry",
"MiscInheritGeometry",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-menubar-default:
@@ -1021,7 +1021,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-menubar-default",
"MiscMenubarDefault",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-mouse-autohide:
@@ -1031,7 +1031,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-mouse-autohide",
"MiscMouseAutohide",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-toolbars-default:
@@ -1041,7 +1041,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-toolbars-default",
"MiscToolbarsDefault",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-confirm-close:
@@ -1051,7 +1051,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-confirm-close",
"MiscConfirmClose",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-cycle-tabs:
@@ -1061,7 +1061,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-cycle-tabs",
"MiscCycleTabs",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-tab-close-buttons:
@@ -1071,7 +1071,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-tab-close-buttons",
"MiscTabCloseButtons",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-tab-close-middle-click:
@@ -1081,7 +1081,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-tab-close-middle-click",
"MiscTabCloseMiddleClick",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-tab-position:
@@ -1092,7 +1092,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"MiscTabPosition",
GTK_TYPE_POSITION_TYPE,
GTK_POS_TOP,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:misc-highlight-urls:
@@ -1102,7 +1102,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"misc-highlight-urls",
"MiscHighlightUrls",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:scrolling-bar:
@@ -1113,7 +1113,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"ScrollingBar",
TERMINAL_TYPE_SCROLLBAR,
TERMINAL_SCROLLBAR_RIGHT,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:scrolling-lines:
@@ -1123,7 +1123,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"scrolling-lines",
"ScrollingLines",
0u, 1024u * 1024u, 1000u,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:scrolling-on-output:
@@ -1133,7 +1133,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"scrolling-on-output",
"ScrollingOnOutput",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:scrolling-on-keystroke:
@@ -1143,7 +1143,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"scrolling-on-keystroke",
"ScrollingOnKeystroke",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:scrolling-single-line:
@@ -1155,7 +1155,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"scrolling-single-line",
"ScrollingSingleLine",
TRUE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:shortcuts-no-menukey:
@@ -1167,7 +1167,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"shortcuts-no-menukey",
"ShortcutsNoMenukey",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:shortcuts-no-mnemonics:
@@ -1177,7 +1177,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"shortcuts-no-mnemonics",
"ShortcutsNoMnemonics",
FALSE,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:title-initial:
@@ -1187,7 +1187,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"title-initial",
"TitleInitial",
_("Terminal"),
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:title-mode:
@@ -1198,7 +1198,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"TitleMode",
TERMINAL_TYPE_TITLE,
TERMINAL_TITLE_APPEND,
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE| G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:term:
@@ -1208,7 +1208,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"term",
"Term",
"xterm",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* TerminalPreferences:word-chars:
@@ -1218,7 +1218,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
"word-chars",
"WordChars",
"-A-Za-z0-9,./?%&#:_=+@~",
- EXO_PARAM_READWRITE);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/* install all properties */
g_object_class_install_properties (gobject_class, N_PROPERTIES, preferences_props);
@@ -1368,7 +1368,7 @@ terminal_preferences_check_blurb (GParamSpec *spec)
*t = '\0';
/* check if the generated option name is equal to the blurb */
- if (!exo_str_is_equal (option, g_param_spec_get_blurb (spec)))
+ if (g_strcmp0 (option, g_param_spec_get_blurb (spec)) != 0)
g_error ("The blurb of property \"%s\" does not match option name", name);
/* cleanup */
@@ -1676,7 +1676,7 @@ terminal_preferences_monitor_connect (TerminalPreferences *preferences,
path = g_file_get_path (preferences->file);
/* check if we need to start or update file monitoring */
- if (path == NULL || !exo_str_is_equal (path, filename))
+ if (g_strcmp0 (path, filename) != 0)
{
/* disconnect old monitor */
terminal_preferences_monitor_disconnect (preferences);
diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h
index f9e7d19..dd91a5c 100644
--- a/terminal/terminal-preferences.h
+++ b/terminal/terminal-preferences.h
@@ -21,7 +21,8 @@
#ifndef __TERMINAL_PREFERENCES_H__
#define __TERMINAL_PREFERENCES_H__
-#include <exo/exo.h>
+#include <gtk/gtk.h>
+#include <libxfce4ui/libxfce4ui.h>
G_BEGIN_DECLS
diff --git a/terminal/terminal-private.h b/terminal/terminal-private.h
index b354f62..3bc9cfa 100644
--- a/terminal/terminal-private.h
+++ b/terminal/terminal-private.h
@@ -70,6 +70,8 @@ G_BEGIN_DECLS
#define g_value_get_object(v) (((const GValue *) (v))->data[0].v_pointer)
#endif
+#define I_(string) (g_intern_static_string ((string)))
+
G_END_DECLS
#endif /* !__TERMINAL_PRIVATE_H__ */
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 73f9634..20ac693 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -197,7 +197,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
"custom-title",
"custom-title",
NULL,
- EXO_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* TerminalScreen:title:
@@ -208,7 +208,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
"title",
"title",
NULL,
- EXO_PARAM_READABLE));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* TerminalScreen::get-context-menu
@@ -255,7 +255,7 @@ terminal_screen_init (TerminalScreen *screen)
screen->scrollbar = gtk_vscrollbar_new (VTE_TERMINAL (screen->terminal)->adjustment);
gtk_box_pack_start (GTK_BOX (screen), screen->scrollbar, FALSE, FALSE, 0);
- g_signal_connect_after (G_OBJECT (screen->scrollbar), "button-press-event", G_CALLBACK (exo_noop_true), NULL);
+ g_signal_connect_after (G_OBJECT (screen->scrollbar), "button-press-event", G_CALLBACK (gtk_true), NULL);
gtk_widget_show (screen->scrollbar);
screen->preferences = terminal_preferences_get ();
@@ -1434,7 +1434,7 @@ terminal_screen_set_custom_title (TerminalScreen *screen,
{
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
- if (!exo_str_is_equal (screen->custom_title, title))
+ if (g_strcmp0 (screen->custom_title, title) != 0)
{
g_free (screen->custom_title);
if (IS_STRING (title))
@@ -1953,16 +1953,20 @@ terminal_screen_get_tab_label (TerminalScreen *screen)
screen->tab_label = gtk_label_new (NULL);
gtk_misc_set_padding (GTK_MISC (screen->tab_label), 2, 0);
gtk_box_pack_start (GTK_BOX (hbox), screen->tab_label, TRUE, TRUE, 0);
- exo_binding_new (G_OBJECT (screen), "title", G_OBJECT (screen->tab_label), "label");
- exo_binding_new (G_OBJECT (screen->tab_label), "label",
- G_OBJECT (screen->tab_label), "tooltip-text");
+ g_object_bind_property (G_OBJECT (screen), "title",
+ G_OBJECT (screen->tab_label), "label",
+ G_BINDING_SYNC_CREATE);
+ g_object_bind_property (G_OBJECT (screen->tab_label), "label",
+ G_OBJECT (screen->tab_label), "tooltip-text",
+ G_BINDING_SYNC_CREATE);
gtk_widget_set_has_tooltip (screen->tab_label, TRUE);
gtk_widget_show (screen->tab_label);
align = gtk_alignment_new (0.5f, 0.5f, 0.0f, 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
- exo_binding_new (G_OBJECT (screen->preferences), "misc-tab-close-buttons",
- G_OBJECT (align), "visible");
+ g_object_bind_property (G_OBJECT (screen->preferences), "misc-tab-close-buttons",
+ G_OBJECT (align), "visible",
+ G_BINDING_SYNC_CREATE);
button = gtk_button_new ();
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
diff --git a/terminal/terminal-shortcut-editor.c b/terminal/terminal-shortcut-editor.c
index e644e3e..6df5aa2 100644
--- a/terminal/terminal-shortcut-editor.c
+++ b/terminal/terminal-shortcut-editor.c
@@ -450,11 +450,11 @@ terminal_shortcut_editor_compose (GtkWidget *dialog,
return TRUE;
accelerator = gtk_accelerator_name (keyval, modifiers);
- if (exo_str_is_equal (accelerator, "<Alt>c"))
+ if (g_strcmp0 (accelerator, "<Alt>c") == 0)
{
response_id = GTK_RESPONSE_CANCEL;
}
- else if (exo_str_is_equal (accelerator, "<Alt>r"))
+ else if (g_strcmp0 (accelerator, "<Alt>r") == 0)
{
response_id = TERMINAL_RESPONSE_CLEAR;
}
@@ -499,7 +499,7 @@ terminal_shortcut_editor_notify (TerminalPreferences *preferences,
gtk_tree_model_get (model, &child,
COLUMN_PROPERTY, &property,
-1);
- if (exo_str_is_equal (property, pspec->name))
+ if (g_strcmp0 (property, pspec->name) == 0)
{
gtk_tree_store_set (GTK_TREE_STORE (model), &child,
COLUMN_ACCEL, IS_STRING (accel) ? accel : _("Disabled"), -1);
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index 3539ef8..dca60ba 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -674,7 +674,6 @@ terminal_widget_open_uri (TerminalWidget *widget,
gchar *uri;
guint i;
GdkScreen *screen;
- const gchar *category = "WebBrowser";
for (i = 0; i < G_N_ELEMENTS (regex_patterns); i++)
{
@@ -694,9 +693,6 @@ terminal_widget_open_uri (TerminalWidget *widget,
break;
case PATTERN_TYPE_EMAIL:
- /* other category then WebBrowser */
- category = "MailReader";
-
if (strncmp (wlink, "mailto:", 7) == 0)
uri = g_strdup (wlink);
else
@@ -709,7 +705,7 @@ terminal_widget_open_uri (TerminalWidget *widget,
/* try to open the URI with the responsible application */
screen = gtk_widget_get_screen (GTK_WIDGET (widget));
- if (!exo_execute_preferred_application_on_screen (category, uri, NULL, NULL, screen, &error))
+ if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error))
{
/* tell the user that we were unable to open the responsible application */
xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (widget))),
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 578499c..3da8c13 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -36,7 +36,6 @@
#include <unistd.h>
#endif
-#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
#include <gdk/gdkkeysyms.h>
@@ -370,8 +369,9 @@ terminal_window_init (TerminalWindow *window)
"tab-hborder", 0,
"tab-vborder", 0,
NULL);
- exo_binding_new (G_OBJECT (window->preferences), "misc-tab-position",
- G_OBJECT (window->notebook), "tab-pos");
+ g_object_bind_property (G_OBJECT (window->preferences), "misc-tab-position",
+ G_OBJECT (window->notebook), "tab-pos",
+ G_BINDING_SYNC_CREATE);
/* hide the ugly terminal border when tabs are shown */
style = gtk_rc_style_new ();
@@ -753,7 +753,9 @@ terminal_window_rebuild_gomenu (TerminalWindow *window)
/* create action */
radio_action = gtk_radio_action_new (name, NULL, NULL, NULL, n);
gtk_action_set_sensitive (GTK_ACTION (radio_action), npages > 1);
- exo_binding_new (G_OBJECT (page), "title", G_OBJECT (radio_action), "label");
+ g_object_bind_property (G_OBJECT (page), "title",
+ G_OBJECT (radio_action), "label",
+ G_BINDING_SYNC_CREATE);
gtk_radio_action_set_group (radio_action, group);
group = gtk_radio_action_get_group (radio_action);
gtk_action_group_add_action (window->action_group, GTK_ACTION (radio_action));
@@ -1518,9 +1520,9 @@ terminal_window_action_goto_tab (GtkRadioAction *action,
static void
-title_dialog_response (GtkWidget *dialog,
- gint response,
- ExoMutualBinding *title_binding)
+title_dialog_response (GtkWidget *dialog,
+ gint response,
+ GBinding *title_binding)
{
/* check if we should open the user manual */
if (response == GTK_RESPONSE_HELP)
@@ -1531,7 +1533,7 @@ title_dialog_response (GtkWidget *dialog,
else
{
/* close the dialog */
- exo_mutual_binding_unbind (title_binding);
+ g_object_unref (title_binding);
gtk_widget_destroy (dialog);
}
}
@@ -1557,7 +1559,7 @@ terminal_window_action_set_title (GtkAction *action,
GtkWidget *box;
GtkWidget *label;
GtkWidget *entry;
- ExoMutualBinding *title_binding;
+ GBinding *title_binding;
if (G_LIKELY (window->active != NULL))
{
@@ -1592,8 +1594,9 @@ terminal_window_action_set_title (GtkAction *action,
atk_relation_set_add (relations, relation);
g_object_unref (G_OBJECT (relation));
- title_binding = exo_mutual_binding_new (G_OBJECT (window->active), "custom-title",
- G_OBJECT (entry), "text");
+ title_binding = g_object_bind_property (G_OBJECT (window->active), "custom-title",
+ G_OBJECT (entry), "text",
+ G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (title_dialog_response), title_binding);
More information about the Xfce4-commits
mailing list