Updating branch refs/heads/master
to c2bf570ea5311f65c825ca2c221924981b9b9015 (commit)
from fad6c3cf731e0273f3c034a8a540f78109805a0b (commit)
commit c2bf570ea5311f65c825ca2c221924981b9b9015
Author: Nick Schermer <n...@xfce.org>
Date: Sun Dec 30 13:44:56 2012 +0100
Rename the dialogs file to util.
po/POTFILES.in | 2 +-
terminal/Makefile.am | 4 ++--
terminal/terminal-preferences-dialog.c | 2 +-
terminal/terminal-preferences-dropdown-dialog.c | 2 +-
terminal/terminal-screen.c | 4 ++--
terminal/{terminal-dialogs.c => terminal-util.c} | 12 ++++++------
terminal/{terminal-dialogs.h => terminal-util.h} | 8 ++++----
terminal/terminal-widget.c | 2 +-
terminal/terminal-window-dropdown.c | 12 ++++++------
terminal/terminal-window.c | 12 ++++++------
10 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 256b794..c9e7fd9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ colorschemes/xterm.theme.in
terminal/main.c
terminal/terminal-app.c
-terminal/terminal-dialogs.c
terminal/terminal-encoding-action.c
terminal/terminal-gdbus.c
terminal/terminal-image-loader.c
@@ -18,6 +17,7 @@ terminal/terminal-preferences-dropdown-dialog.c
terminal/terminal-preferences.c
terminal/terminal-screen.c
terminal/terminal-search-dialog.c
+terminal/terminal-util.c
terminal/terminal-widget.c
terminal/terminal-window-dropdown.c
terminal/terminal-window.c
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 1ce5036..99c55b0 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -18,7 +18,6 @@ xfce4_terminal_built_sources = \
xfce4_terminal_headers = \
terminal-app.h \
- terminal-dialogs.h \
terminal-encoding-action.h \
terminal-gdbus.h \
terminal-image-loader.h \
@@ -29,6 +28,7 @@ xfce4_terminal_headers = \
terminal-search-dialog.h \
terminal-private.h \
terminal-screen.h \
+ terminal-util.h \
terminal-widget.h \
terminal-window.h \
terminal-window-dropdown.h
@@ -38,7 +38,6 @@ xfce4_terminal_SOURCES = \
$(xfce4_terminal_headers) \
main.c \
terminal-app.c \
- terminal-dialogs.c \
terminal-encoding-action.c \
terminal-gdbus.c \
terminal-image-loader.c \
@@ -48,6 +47,7 @@ xfce4_terminal_SOURCES = \
terminal-preferences-dropdown-dialog.c \
terminal-search-dialog.c \
terminal-screen.c \
+ terminal-util.c \
terminal-widget.c \
terminal-window.c \
terminal-window-dropdown.c
diff --git a/terminal/terminal-preferences-dialog.c
b/terminal/terminal-preferences-dialog.c
index 52ebd59..acf7a7a 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -24,7 +24,7 @@
#include <libxfce4ui/libxfce4ui.h>
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-preferences-dialog.h>
#include <terminal/terminal-encoding-action.h>
diff --git a/terminal/terminal-preferences-dropdown-dialog.c
b/terminal/terminal-preferences-dropdown-dialog.c
index 227e440..8fd59af 100644
--- a/terminal/terminal-preferences-dropdown-dialog.c
+++ b/terminal/terminal-preferences-dropdown-dialog.c
@@ -22,7 +22,7 @@
#include <libxfce4ui/libxfce4ui.h>
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-preferences.h>
#include <terminal/terminal-preferences-dropdown-dialog.h>
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 429cb5c..c21cda7 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -41,7 +41,7 @@
#include <libxfce4ui/libxfce4ui.h>
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-image-loader.h>
#include <terminal/terminal-marshal.h>
@@ -2172,7 +2172,7 @@ terminal_screen_get_tab_label (TerminalScreen *screen)
gtk_widget_show (button);
/* make button a bit smaller */
- terminal_set_style_thinkess (button, 0);
+ terminal_util_set_style_thinkess (button, 0);
/* button image */
image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-util.c
similarity index 93%
rename from terminal/terminal-dialogs.c
rename to terminal/terminal-util.c
index 04ecc8b..ab76910 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-util.c
@@ -35,13 +35,13 @@
#include <X11/Xlib.h>
#endif
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-private.h>
/**
- * terminal_dialogs_show_about:
+ * terminal_util_show_about_dialog:
* @parent : the parent #GtkWindow or %NULL.
* @title : the software title.
* @format : the printf()-style format for the main text in the about dialog.
@@ -50,7 +50,7 @@
* Displays the Terminal about dialog with @format as main text.
**/
void
-terminal_dialogs_show_about (GtkWindow *parent)
+terminal_util_show_about_dialog (GtkWindow *parent)
{
static const gchar *authors[] =
{
@@ -94,8 +94,8 @@ terminal_dialogs_show_about (GtkWindow *parent)
void
-terminal_set_style_thinkess (GtkWidget *widget,
- gint thinkness)
+terminal_util_set_style_thinkess (GtkWidget *widget,
+ gint thinkness)
{
GtkRcStyle *style;
@@ -108,7 +108,7 @@ terminal_set_style_thinkess (GtkWidget *widget,
void
-terminal_activate_window (GtkWindow *window)
+terminal_util_activate_window (GtkWindow *window)
{
#ifdef GDK_WINDOWING_X11
XClientMessageEvent event;
diff --git a/terminal/terminal-dialogs.h b/terminal/terminal-util.h
similarity index 78%
rename from terminal/terminal-dialogs.h
rename to terminal/terminal-util.h
index 1efbb30..5a819bd 100644
--- a/terminal/terminal-dialogs.h
+++ b/terminal/terminal-util.h
@@ -23,12 +23,12 @@
G_BEGIN_DECLS
-void terminal_dialogs_show_about (GtkWindow *parent);
+void terminal_util_show_about_dialog (GtkWindow *parent);
-void terminal_set_style_thinkess (GtkWidget *widget,
- gint thinkness);
+void terminal_util_set_style_thinkess (GtkWidget *widget,
+ gint thinkness);
-void terminal_activate_window (GtkWindow *window);
+void terminal_util_activate_window (GtkWindow *window);
G_END_DECLS
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index 1aada96..40a394a 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -32,7 +32,7 @@
#include <gdk/gdkkeysyms.h>
#include <libxfce4ui/libxfce4ui.h>
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-marshal.h>
#include <terminal/terminal-preferences.h>
diff --git a/terminal/terminal-window-dropdown.c
b/terminal/terminal-window-dropdown.c
index 5c1a6dd..b2701e5 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -41,7 +41,7 @@
#include <terminal/terminal-private.h>
#include <terminal/terminal-window.h>
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-window-dropdown.h>
#include <terminal/terminal-preferences-dropdown-dialog.h>
@@ -250,14 +250,14 @@ terminal_window_dropdown_init (TerminalWindowDropdown
*dropdown)
gtk_window_stick (GTK_WINDOW (dropdown));
/* this avoids to return focus to the window after dialog changes,
- * but we have terminal_activate_window() for that */
+ * but we have terminal_util_activate_window() for that */
gtk_window_set_skip_pager_hint (GTK_WINDOW (dropdown), TRUE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dropdown), TRUE);
/* adjust notebook for drop-down usage */
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), TRUE);
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (window->notebook), GTK_POS_BOTTOM);
- terminal_set_style_thinkess (window->notebook, 1);
+ terminal_util_set_style_thinkess (window->notebook, 1);
/* actions we don't want */
action = gtk_action_group_get_action (window->action_group, "show-borders");
@@ -366,7 +366,7 @@ terminal_window_dropdown_set_property (GObject *object,
case PROP_DROPDOWN_KEEP_ABOVE:
gtk_window_set_keep_above (GTK_WINDOW (dropdown), g_value_get_boolean
(value));
if (dropdown->preferences_dialog != NULL)
- terminal_activate_window (GTK_WINDOW (dropdown->preferences_dialog));
+ terminal_util_activate_window (GTK_WINDOW
(dropdown->preferences_dialog));
return;
case PROP_DROPDOWN_ANIMATION_TIME:
@@ -800,7 +800,7 @@ terminal_window_dropdown_toggle_real
(TerminalWindowDropdown *dropdown,
else
{
terminal_window_dropdown_show (dropdown, timestamp);
- terminal_activate_window (GTK_WINDOW (dropdown));
+ terminal_util_activate_window (GTK_WINDOW (dropdown));
}
}
else
@@ -821,7 +821,7 @@ terminal_window_dropdown_preferences_died (gpointer
user_data,
dropdown->preferences_dialog = NULL;
TERMINAL_WINDOW (dropdown)->n_child_windows--;
- terminal_activate_window (GTK_WINDOW (dropdown));
+ terminal_util_activate_window (GTK_WINDOW (dropdown));
}
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index fc2b211..15e23cf 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -43,7 +43,7 @@
#include <gdk/gdkx.h>
#endif
-#include <terminal/terminal-dialogs.h>
+#include <terminal/terminal-util.h>
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-options.h>
#include <terminal/terminal-preferences-dialog.h>
@@ -351,7 +351,7 @@ terminal_window_init (TerminalWindow *window)
NULL);
/* hide the ugly terminal border when tabs are shown */
- terminal_set_style_thinkess (window->notebook, 0);
+ terminal_util_set_style_thinkess (window->notebook, 0);
/* set the notebook group id */
gtk_notebook_set_group (GTK_NOTEBOOK (window->notebook),
@@ -1372,7 +1372,7 @@ terminal_window_action_prefs_died (gpointer user_data,
window->n_child_windows--;
if (window->drop_down)
- terminal_activate_window (GTK_WINDOW (window));
+ terminal_util_activate_window (GTK_WINDOW (window));
}
@@ -1582,7 +1582,7 @@ title_dialog_response (GtkWidget *dialog,
{
/* need for hiding on focus */
if (window->drop_down)
- terminal_activate_window (GTK_WINDOW (window));
+ terminal_util_activate_window (GTK_WINDOW (window));
/* close the dialog */
window->n_child_windows--;
@@ -1699,7 +1699,7 @@ terminal_window_action_search_response (GtkWidget
*dialog,
{
/* need for hiding on focus */
if (window->drop_down)
- terminal_activate_window (GTK_WINDOW (window));
+ terminal_util_activate_window (GTK_WINDOW (window));
/* hide dialog */
window->n_child_windows--;
@@ -1794,7 +1794,7 @@ terminal_window_action_about (GtkAction *action,
TerminalWindow *window)
{
/* display the about dialog */
- terminal_dialogs_show_about (GTK_WINDOW (window));
+ terminal_util_show_about_dialog (GTK_WINDOW (window));
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
