[Xfce4-commits] xfwm4:master Fix broken button layouts by obtaining button IDs correctly (bug 6824).
Updating branch refs/heads/master
to a3225e2e116a68833994349c949cd6fb0b6fdaae (commit)
from 54d6a560cd8a133ea8d97a4466eb9bf8c8bee4cf (commit)
commit a3225e2e116a68833994349c949cd6fb0b6fdaae
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Nov 14 12:56:27 2010 +0100
Fix broken button layouts by obtaining button IDs correctly (bug 6824).
Since GTK+ 2.20, gtk_buildable_get_name() needs to be used instead of
gtk_widget_get_name() (which always returns 'GtkButton' in this case).
NEWS |6 +++
settings-dialogs/xfwm4-settings.c | 63 +++-
2 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/NEWS b/NEWS
index ab7fd09..16e80bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+4.7.x
+=
+- Fix corrupted button layouts by obtaining the button IDs correctly
+ (bug #6824).
+
+
4.7.1
=
- Fix break with latest API changes in libxfce4ui.
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index 550ce00..0d4d21b 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -517,7 +517,7 @@ xfwm_settings_constructed (GObject *object)
for (list_iter = children; list_iter != NULL; list_iter = g_list_next
(list_iter))
{
button = GTK_WIDGET (list_iter-data);
-name = gtk_widget_get_name (button);
+name = gtk_buildable_get_name (GTK_BUILDABLE (button));
if (name[strlen (name) - 1] == '|')
{
@@ -542,36 +542,36 @@ xfwm_settings_constructed (GObject *object)
G_CALLBACK (xfwm_settings_signal_blocker), NULL);
g_signal_connect (button, focus, G_CALLBACK
(xfwm_settings_signal_blocker), NULL);
}
- }
- g_list_free (children);
-
- children = gtk_container_get_children (GTK_CONTAINER (hidden_box));
- for (list_iter = children; list_iter != NULL; list_iter = g_list_next
(list_iter))
-{
- button = GTK_WIDGET (list_iter-data);
- name = gtk_widget_get_name (button);
+g_list_free (children);
- g_object_set_data (G_OBJECT (button), key_char, (gpointer)
name[strlen (name) - 1]);
- gtk_drag_source_set (button, GDK_BUTTON1_MASK, target_entry[0], 1,
GDK_ACTION_MOVE);
+children = gtk_container_get_children (GTK_CONTAINER (hidden_box));
+for (list_iter = children; list_iter != NULL; list_iter = g_list_next
(list_iter))
+ {
+button = GTK_WIDGET (list_iter-data);
+name = gtk_buildable_get_name (GTK_BUILDABLE (button));
-g_signal_connect (button, drag_data_get,
- G_CALLBACK (xfwm_settings_title_button_drag_data),
NULL);
-g_signal_connect (button, drag_begin, G_CALLBACK
(xfwm_settings_title_button_drag_begin),
- NULL);
-g_signal_connect (button, drag_end, G_CALLBACK
(xfwm_settings_title_button_drag_end),
- NULL);
-g_signal_connect (button, button_press_event,
- G_CALLBACK (xfwm_settings_signal_blocker), NULL);
-g_signal_connect (button, enter_notify_event,
- G_CALLBACK (xfwm_settings_signal_blocker), NULL);
-g_signal_connect (button, focus, G_CALLBACK
(xfwm_settings_signal_blocker), NULL);
-}
- g_list_free (children);
+g_object_set_data (G_OBJECT (button), key_char, (gpointer)
name[strlen (name) - 1]);
+gtk_drag_source_set (button, GDK_BUTTON1_MASK, target_entry[0], 1,
GDK_ACTION_MOVE);
+
+ g_signal_connect (button, drag_data_get,
+G_CALLBACK (xfwm_settings_title_button_drag_data),
NULL);
+ g_signal_connect (button, drag_begin, G_CALLBACK
(xfwm_settings_title_button_drag_begin),
+NULL);
+ g_signal_connect (button, drag_end, G_CALLBACK
(xfwm_settings_title_button_drag_end),
+NULL);
+ g_signal_connect (button, button_press_event,
+G_CALLBACK (xfwm_settings_signal_blocker), NULL);
+ g_signal_connect (button, enter_notify_event,
+G_CALLBACK (xfwm_settings_signal_blocker), NULL);
+ g_signal_connect (button, focus, G_CALLBACK
(xfwm_settings_signal_blocker), NULL);
+ }
+g_list_free (children);
- xfconf_channel_get_property (settings-priv-wm_channel,
/general/button_layout, value);
- xfwm_settings_button_layout_property_changed (settings-priv-wm_channel,
-/general/button_layout,
value, settings);
- g_value_unset (value);
+xfconf_channel_get_property (settings-priv-wm_channel,
/general/button_layout, value);
+xfwm_settings_button_layout_property_changed (settings-priv-wm_channel,
+ /general/button_layout,
value, settings);
+g_value_unset (value);
+ }
/* Keyboard tab widgets */
[Xfce4-commits] xfwm4:master Bump the GTK+ dependency to 2.14 (minimum required for Xfce 4.8).
Updating branch refs/heads/master to d112dfbdac1ab0208ca41bd65ff46c5db7533521 (commit) from a3225e2e116a68833994349c949cd6fb0b6fdaae (commit) commit d112dfbdac1ab0208ca41bd65ff46c5db7533521 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Nov 14 13:01:36 2010 +0100 Bump the GTK+ dependency to 2.14 (minimum required for Xfce 4.8). NEWS|2 ++ configure.ac.in |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 16e80bd..1ea3e45 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ = - Fix corrupted button layouts by obtaining the button IDs correctly (bug #6824). +- Bump the GTK+ dependency to 2.14 which is the minimum version required + for Xfce 4.8. 4.7.1 diff --git a/configure.ac.in b/configure.ac.in index 0cbfee2..dbd20a3 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,7 +10,7 @@ m4_define([xfwm4_version_build], [...@revision@]) m4_define([xfwm4_version_tag], [git]) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) -m4_define([gtk_minimum_version], [2.10.0]) +m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.6.0]) m4_define([libxfce4ui_minimum_version], [4.7.4]) m4_define([libxfce4kbd_private_minimum_version], [4.7.4]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Remove checks for older GLib/GTK+ versions that are no longer needed.
Updating branch refs/heads/master
to d375b9b45721d9fb48f02d0f6764c0d811319293 (commit)
from 5772901126a8e820c4a846d6c7385c9cc0364637 (commit)
commit d375b9b45721d9fb48f02d0f6764c0d811319293
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Nov 14 13:09:57 2010 +0100
Remove checks for older GLib/GTK+ versions that are no longer needed.
settings/main.c |4
src/xfdesktop-clipboard-manager.c |2 --
src/xfdesktop-file-icon-manager.c |3 +--
src/xfdesktop-icon-view.c |6 --
4 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/settings/main.c b/settings/main.c
index 06edc9b..ee5d464 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1241,7 +1241,6 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
panel-monitor = j;
if(nscreens 1 nmonitors 1) {
-#if GTK_CHECK_VERSION(2, 13, 0)
gchar *monitor_name = gdk_screen_get_monitor_plug_name(screen,
j);
if(monitor_name) {
@@ -1250,13 +1249,11 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
monitor_name);
g_free(monitor_name);
} else
-#endif
g_snprintf(buf, sizeof(buf), _(Screen %d, Monitor %d),
i+1, j+1);
} else if(nscreens 1)
g_snprintf(buf, sizeof(buf), _(Screen %d), i+1);
else {
-#if GTK_CHECK_VERSION(2, 13, 0)
gchar *monitor_name = gdk_screen_get_monitor_plug_name(screen,
j);
if(monitor_name) {
@@ -1264,7 +1261,6 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
j+1, monitor_name);
g_free(monitor_name);
} else
-#endif
g_snprintf(buf, sizeof(buf), _(Monitor %d), j+1);
}
diff --git a/src/xfdesktop-clipboard-manager.c
b/src/xfdesktop-clipboard-manager.c
index a006864..76b4bef 100644
--- a/src/xfdesktop-clipboard-manager.c
+++ b/src/xfdesktop-clipboard-manager.c
@@ -537,9 +537,7 @@ xfdesktop_clipboard_manager_transfer_files
(XfdesktopClipboardManager *manager,
G_OBJECT (manager));
/* Need to fake a owner-change event here if the Xserver doesn't support
clipboard notification */
-#if GTK_CHECK_VERSION(2,6,0)
if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display
(manager-clipboard)))
-#endif
{
xfdesktop_clipboard_manager_owner_changed (manager-clipboard, NULL,
manager);
}
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index a75f413..74f4a3d 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -416,7 +416,6 @@ __migrate_old_icon_positions(XfdesktopFileIconManager
*fmanager)
GError *error = NULL;
if(g_file_get_contents(old_file, contents, length, error)) {
-#if GLIB_CHECK_VERSION(2, 8, 0)
if(!g_file_set_contents(new_file, contents, length,
error))
{
@@ -424,7 +423,7 @@ __migrate_old_icon_positions(XfdesktopFileIconManager
*fmanager)
error-message);
g_error_free(error);
}
-#else
+
FILE *fp = fopen(new_file, w);
gboolean success = FALSE;
if(fp) {
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index db36a74..7596c10 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -313,14 +313,12 @@ static gboolean
xfdesktop_icon_view_icon_find_position(XfdesktopIconView *icon_v
static gboolean xfdesktop_icon_view_shift_area_to_cell(XfdesktopIconView
*icon_view,
XfdesktopIcon *icon,
GdkRectangle
*text_area);
-#if GTK_CHECK_VERSION(2, 12, 0)
static gboolean xfdesktop_icon_view_show_tooltip(GtkWidget *widget,
gint x,
gint y,
gboolean keyboard_tooltip,
GtkTooltip *tooltip,
gpointer user_data);
-#endif
static void xfdesktop_icon_view_real_select_all(XfdesktopIconView *icon_view);
static void xfdesktop_icon_view_real_unselect_all(XfdesktopIconView
*icon_view);
@@ -641,11 +639,9 @@ xfdesktop_icon_view_init(XfdesktopIconView *icon_view)
icon_view_n_targets);
[Xfce4-commits] xfce4-notifyd:master Remove remaining libsexy references.
Updating branch refs/heads/master to 16e92c4958479089cbc8782484d5000cf62fa0f4 (commit) from 3beb6c58d1faf745c38304e8bd213972c8d66db6 (commit) commit 16e92c4958479089cbc8782484d5000cf62fa0f4 Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Nov 14 14:18:56 2010 +0100 Remove remaining libsexy references. README |1 - xfce4-notifyd/xfce-notify-window.c |2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/README b/README index e8c1881..79ffd1c 100644 --- a/README +++ b/README @@ -16,7 +16,6 @@ Requirements: * libxfce4util 4.4.0 * libxfce4ui 4.7.0 * xfconf 0.1.0svn-r26876 -* libsexy 0.1.6 (optional) Additionally, I'd recommend use with a compositing manager running; in that case xfce4-notifyd will look a bit nicer and will be semi-transparent and diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c index 8006921..d10ef1c 100644 --- a/xfce4-notifyd/xfce-notify-window.c +++ b/xfce4-notifyd/xfce-notify-window.c @@ -778,7 +778,7 @@ xfce_notify_window_validate_escape_markup(const gchar *str) goto out_err; } #if GTK_CHECK_VERSION(2,16,0) -/* only support links with SexyUrlLabel*/ +/* only support links with gtk 2.16 */ g_string_append_len(gstr, p, aend - p + 1); #endif p = aend + 1; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Remove libsexy dependency.
Updating branch refs/heads/master
to 3beb6c58d1faf745c38304e8bd213972c8d66db6 (commit)
from 82f087355e7eb169a5c7c90139e8db9abd9f93a5 (commit)
commit 3beb6c58d1faf745c38304e8bd213972c8d66db6
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Nov 13 11:49:35 2010 +0100
Remove libsexy dependency.
Use links in GtkLabel instead, will only work with gtk 2.16.
Makefile.am|2 -
configure.ac.in|4 --
xfce4-notifyd/xfce-notify-window.c | 77 ++--
3 files changed, 13 insertions(+), 70 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4323f73..65c249b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ common_cflags = \
xfce4_notifyd_xfce4_notifyd_CFLAGS = \
-DG_LOG_DOMAIN=\xfce4-notifyd\ \
$(common_cflags) \
- $(LIBSEXY_CFLAGS) \
$(LIBX11_CFLAGS)
xfce4_notifyd_config_xfce4_notifyd_config_CFLAGS = \
@@ -60,7 +59,6 @@ common_ldadd = \
xfce4_notifyd_xfce4_notifyd_LDADD = \
$(common_ldadd) \
- $(LIBSEXY_LIBS) \
$(LIBX11_LIBS)
xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \
diff --git a/configure.ac.in b/configure.ac.in
index d06abde..6392532 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -59,10 +59,6 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72])
-XDT_CHECK_OPTIONAL_PACKAGE([LIBSEXY], [libsexy], [0.1.6], [libsexy],
- [libsexy support (for clickable URLs)
(default=yes)],
- [yes])
-
AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool])
AS_IF([test -z $DBUS_BINDING_TOOL],
[
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index 93fa112..8006921 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -30,10 +30,6 @@
#include libxfce4ui/libxfce4ui.h
-#ifdef HAVE_LIBSEXY
-#include libsexy/sexy.h
-#endif
-
#include xfce-notify-window.h
#include xfce-notify-enum-types.h
@@ -122,12 +118,6 @@ static gboolean xfce_notify_window_fade_timeout(gpointer
data);
static void xfce_notify_window_button_clicked(GtkWidget *widget,
gpointer user_data);
-#ifdef HAVE_LIBSEXY
-static void xfce_notify_window_url_clicked(SexyUrlLabel *label,
- const gchar *url,
- gpointer user_data);
-#endif
-
static guint signals[N_SIGS] = { 0, };
@@ -206,7 +196,7 @@ xfce_notify_window_init(XfceNotifyWindow *window)
GdkScreen *screen;
GtkWidget *tophbox, *align, *vbox;
gdouble border_radius = DEFAULT_RADIUS;
-
+
GTK_WINDOW(window)-type = GTK_WINDOW_TOPLEVEL;
window-expire_timeout = DEFAULT_EXPIRE_TIMEOUT;
window-normal_opacity = DEFAULT_NORMAL_OPACITY;
@@ -263,18 +253,10 @@ xfce_notify_window_init(XfceNotifyWindow *window)
gtk_misc_set_alignment(GTK_MISC(window-summary), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(vbox), window-summary, FALSE, FALSE, 0);
-#ifdef HAVE_LIBSEXY
-window-body = sexy_url_label_new();
-#else
window-body = gtk_label_new(NULL);
-#endif
gtk_label_set_line_wrap(GTK_LABEL(window-body), TRUE);
gtk_misc_set_alignment(GTK_MISC(window-body), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(vbox), window-body, TRUE, TRUE, 0);
-#ifdef HAVE_LIBSEXY
-g_signal_connect(G_OBJECT(window-body), url-activated,
- G_CALLBACK(xfce_notify_window_url_clicked), window);
-#endif
window-button_box = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(window-button_box),
@@ -452,7 +434,7 @@ xfce_notify_window_ensure_bg_path(XfceNotifyWindow *window,
}
window-bg_path = cairo_copy_path(cr);
-
+
flat_path = cairo_copy_path_flat(cr);
fill_rule = (cairo_get_fill_rule(cr) == CAIRO_FILL_RULE_WINDING
? GDK_WINDING_RULE : GDK_EVEN_ODD_RULE);
@@ -733,36 +715,6 @@ xfce_notify_window_button_clicked(GtkWidget *widget,
XFCE_NOTIFY_CLOSE_REASON_DISMISSED);
}
-#ifdef HAVE_LIBSEXY
-static void
-xfce_notify_window_url_clicked(SexyUrlLabel *label,
- const gchar *url,
- gpointer user_data)
-{
-gchar *opener, *url_quoted, *cmd = NULL;
-
-if(!(opener = g_find_program_in_path(xdg-open)))
-if(!(opener = g_find_program_in_path(exo-open)))
-if(!(opener = g_find_program_in_path(gnome-open)))
-opener = g_find_program_in_path(firefox);
-
-if(opener) {
-url_quoted = g_shell_quote(url);
-cmd = g_strdup_printf(%s %s, opener, url_quoted);
-GError *error = NULL;
-if(!g_spawn_command_line_async(cmd, error)) {
-xfce_dialog_show_error(NULL,
- error,
-
[Xfce4-commits] xfce4-notifyd:master Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-notifyd
Updating branch refs/heads/master to e5d0a8f1c9ae8c5b49b95e00a46d7752a445892d (commit) from 16e92c4958479089cbc8782484d5000cf62fa0f4 (commit) commit e5d0a8f1c9ae8c5b49b95e00a46d7752a445892d Merge: 16e92c4 d7f308b Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Nov 14 14:19:19 2010 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-notifyd commit d7f308b0d8861d18ef1cebb9f8b83b053a81b248 Author: Johannes Lips johannes.l...@googlemail.com Date: Sat Nov 13 20:02:45 2010 +0100 l10n: Updated German (de) translation to 76% New status: 20 messages complete with 6 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 69f892e253ba7593ec543c3696690cb81bbd0305 Author: Jari Rahkonen jari.rahko...@pp1.inet.fi Date: Thu Nov 11 16:36:54 2010 +0100 l10n: Updated Finnish (fi) translation to 100% New status: 26 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 30 -- po/fi.po | 37 + 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/po/de.po b/po/de.po index 8e21d28..3e6039d 100644 --- a/po/de.po +++ b/po/de.po @@ -2,19 +2,19 @@ # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Christian Dywan christ...@twotoasts.de, 2008. -# +# msgid msgstr Project-Id-Version: xfce4-notifyd 1.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 18:14+0100\n +POT-Creation-Date: 2010-11-13 17:03+\n PO-Revision-Date: 2008-11-16 03:04+1\n Last-Translator: Christian Dywan christ...@twotoasts.de\n Language-Team: German d...@li.org\n -Language: de\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: de\n #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 #: ../xfce4-notifyd-config/main.c:229 @@ -30,20 +30,20 @@ msgstr Unbekannte Option »%s«\n msgid Unable to start notification daemon msgstr Benachrichtigungsdämon konnte nicht gestartet werden -#: ../xfce4-notifyd/xfce-notify-daemon.c:1073 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1069 #, c-format msgid Unable to connect to D-Bus session bus msgstr Verbindung zu D-Bus-Sitzungsbus konnte nicht hergestellt werden -#: ../xfce4-notifyd/xfce-notify-daemon.c:1090 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1086 #, fuzzy, c-format msgid Another notification xndaemon is already running msgstr Ein anderer Benachrichtigungsdämon läuft bereits #: ../xfce4-notifyd/xfce-notify-window.c:756 -#, c-format +#, c-format, fuzzy msgid %s could not be launched -msgstr +msgstr %s konnte nicht gestartet werden #: ../xfce4-notifyd/xfce-notify-window.c:857 msgid image: @@ -77,9 +77,7 @@ msgstr Geben Sie »%s --help« ein, um Hinweise zur Nutzung zu erhalten. #: ../xfce4-notifyd-config/main.c:309 #, c-format msgid Released under the terms of the GNU General Public License, version 2\n -msgstr -Veröffentlicht unter den Bedingungen der GNU General Public License, version -2\n +msgstr Veröffentlicht unter den Bedingungen der GNU General Public License, version 2\n #: ../xfce4-notifyd-config/main.c:310 #, c-format @@ -87,12 +85,14 @@ msgid Please report bugs to %s.\n msgstr Fehlerberichte bitte an %s melden.\n #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:1 +#, fuzzy msgid Bottom left -msgstr +msgstr Unten links #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:2 +#, fuzzy msgid Bottom right -msgstr +msgstr Unten rechts #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 @@ -109,12 +109,14 @@ msgid Notifications msgstr Benachrichtigungen #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 +#, fuzzy msgid Top left -msgstr +msgstr Oben links #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 +#, fuzzy msgid Top right -msgstr +msgstr Oben rechts #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid _Disappear after: diff --git a/po/fi.po b/po/fi.po index f5967f7..a45f785 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,20 +1,20 @@ # Finnish translations for xfce4-notifyd package. # Copyright (C) 2008 Brian J. Tarricone # This file is distributed under the same license as the xfce-notifyd package. -# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2008. +# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2008, 2010. # msgid msgstr Project-Id-Version: xfce4-notifyd\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 18:14+0100\n -PO-Revision-Date: 2008-11-16 12:39+0200\n +POT-Creation-Date: 2010-11-11 11:03+\n +PO-Revision-Date: 2010-11-11 17:36+0200\n Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n -Language-Team: Finnish\n -Language: \n +Language-Team: Finnish xfce-i...@xfce.org\n MIME-Version: 1.0\n
[Xfce4-commits] xfdesktop:master Fix mistakes I made in the last commit.
Updating branch refs/heads/master
to 4518463ef4d695a798c2c3f7ac57cafb3a0b23f0 (commit)
from d375b9b45721d9fb48f02d0f6764c0d811319293 (commit)
commit 4518463ef4d695a798c2c3f7ac57cafb3a0b23f0
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Nov 14 15:12:34 2010 +0100
Fix mistakes I made in the last commit.
src/xfdesktop-file-icon-manager.c | 13 -
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index 74f4a3d..c271118 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -424,19 +424,6 @@ __migrate_old_icon_positions(XfdesktopFileIconManager
*fmanager)
g_error_free(error);
}
-FILE *fp = fopen(new_file, w);
-gboolean success = FALSE;
-if(fp) {
-success = (fwrite(contents, 1, length, fp) == length);
-success = !fclose(fp);
-}
-
-if(!success) {
-g_critical(Unable to write to %s: %s, new_file,
- strerror(errno));
-}
-#endif
-
g_free(contents);
} else {
g_critical(Unable to read from %s: %s, old_file,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Depend on wnck = 2.22, no longer use signal workarounds (bug #6638).
Updating branch refs/heads/master
to 6dbd07e89bf85d096595a823ba7fb6171f71f493 (commit)
from 4518463ef4d695a798c2c3f7ac57cafb3a0b23f0 (commit)
commit 6dbd07e89bf85d096595a823ba7fb6171f71f493
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Nov 14 17:43:48 2010 +0100
Depend on wnck = 2.22, no longer use signal workarounds (bug #6638).
NEWS|3 ++
configure.ac.in |2 +-
src/xfdesktop-window-icon-manager.c | 36 +-
3 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/NEWS b/NEWS
index 70bdbd9..44a3c4a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ Xfdesktop 4.7.x
items to the right-click menu.
* Select the correct icon style in the desktop settings on first
start (bug #6798).
+ * Depend on libwnck = 2.22 so we no longer have to implement hacks
+for the two different active-workspace-changed signal variants
+in libwnck (bug #6638).
Xfdesktop 4.7.2
diff --git a/configure.ac.in b/configure.ac.in
index 96fba75..5832422 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -22,7 +22,7 @@ m4_define([garcon_minimum_version], [0.1.2])
m4_define([exo_minimum_version], [0.3.100])
m4_define([thunar_minimum_version], [1.1.3])
m4_define([dbus_minimum_version], [0.34])
-m4_define([wnck_minimum_version], [2.12])
+m4_define([wnck_minimum_version], [2.22])
m4_define([intltool_minimum_version], [0.31])
m4_define([xfconf_minimum_version], [4.6.0])
diff --git a/src/xfdesktop-window-icon-manager.c
b/src/xfdesktop-window-icon-manager.c
index 491e307..f0c35ca 100644
--- a/src/xfdesktop-window-icon-manager.c
+++ b/src/xfdesktop-window-icon-manager.c
@@ -2,6 +2,7 @@
* xfdesktop - xfce4's desktop manager
*
* Copyright (c) 2006 Brian Tarricone, bj...@cornell.edu
+ * Copyright (c) 2010 Jannis Pohlmann, jan...@xfce.org
*
* 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
@@ -28,18 +29,17 @@
#include glib-object.h
+#include libwnck/libwnck.h
+
#include libxfce4util/libxfce4util.h
+
#include libxfce4ui/libxfce4ui.h
-#include libwnck/libwnck.h
#include xfdesktop-icon-view.h
#include xfdesktop-window-icon.h
#include xfdesktop-window-icon-manager.h
#include xfce-desktop.h
-
-static gboolean __wnck_has_new_active_workspace_changed_signal = TRUE;
-
static void xfdesktop_window_icon_manager_set_property(GObject *object,
guint property_id,
const GValue *value,
@@ -93,7 +93,6 @@ static void
xfdesktop_window_icon_manager_class_init(XfdesktopWindowIconManagerClass
*klass)
{
GObjectClass *gobject_class = (GObjectClass *)klass;
-guint sig_id;
g_type_class_add_private(klass, sizeof(XfdesktopWindowIconManagerPrivate));
@@ -107,21 +106,6 @@
xfdesktop_window_icon_manager_class_init(XfdesktopWindowIconManagerClass *klass)
GDK_TYPE_SCREEN,
G_PARAM_READWRITE
|
G_PARAM_CONSTRUCT_ONLY));
-
-/* make sure the class is alive; g_signal_lookup() fails otherwise */
-if(!g_type_class_peek(WNCK_TYPE_SCREEN))
-g_type_class_ref(WNCK_TYPE_SCREEN);
-sig_id = g_signal_lookup(active-workspace-changed, WNCK_TYPE_SCREEN);
-if(sig_id) {
-GSignalQuery query;
-
-g_signal_query(sig_id, query);
-if(query.n_params == 0)
-__wnck_has_new_active_workspace_changed_signal = FALSE;
-else
-__wnck_has_new_active_workspace_changed_signal = TRUE;
-DBG(active-workspace-changed signal has %d param(s)\n,
query.n_params);
-}
}
static void
@@ -236,21 +220,13 @@ xfdesktop_add_window_icons_foreach(gpointer key,
static void
workspace_changed_cb(WnckScreen *wnck_screen,
- gpointer arg1,
+ WnckWorkspace *previously_active_space,
gpointer user_data)
{
-XfdesktopWindowIconManager *wmanager;
+XfdesktopWindowIconManager *wmanager =
XFDESKTOP_WINDOW_ICON_MANAGER(user_data);
gint n;
WnckWorkspace *ws;
-/* as of libwnck 2.20, the active-workspace-changed signal has
- * a new prototype with an extra argument. previous versions don't
- * have this argument, so we fudge this here (bug 4395). */
-if(G_LIKELY(__wnck_has_new_active_workspace_changed_signal))
-wmanager = XFDESKTOP_WINDOW_ICON_MANAGER(user_data);
-else
-wmanager = XFDESKTOP_WINDOW_ICON_MANAGER(arg1);
-
ws = wnck_screen_get_active_workspace(wmanager-priv-wnck_screen);
if(!WNCK_IS_WORKSPACE(ws)) {
DBG(got weird failure of wnck_screen_get_active_workspace(),
bailing);
___
[Xfce4-commits] xfce4-settings:master Don't activate numlock on first launch.
Updating branch refs/heads/master to 6c13ff5975a5c24a2019a47a5fdb23754b7238ff (commit) from 022bc7908523d36b4976668abf3c0f94e3e73a62 (commit) commit 6c13ff5975a5c24a2019a47a5fdb23754b7238ff Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Nov 14 17:48:02 2010 +0100 Don't activate numlock on first launch. NEWS |1 + xfce4-settings-helper/keyboards.c |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 41c7866..9993fa1 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 4.7.5 = - Use xfconf_channel_get instead of xfconf_channel_new. +- Don't activate numlock on first launch. 4.7.4 = diff --git a/xfce4-settings-helper/keyboards.c b/xfce4-settings-helper/keyboards.c index 00f6040..2fe0fbf 100644 --- a/xfce4-settings-helper/keyboards.c +++ b/xfce4-settings-helper/keyboards.c @@ -228,7 +228,7 @@ xfce_keyboards_helper_restore_numlock_state (XfconfChannel *channel) gboolean state; dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); -state = xfconf_channel_get_bool (channel, /Default/Numlock, TRUE); +state = xfconf_channel_get_bool (channel, /Default/Numlock, FALSE); numlock_mask = XkbKeysymToModifiers (dpy, XK_Num_Lock); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Use xfconf_channel_get in keyboards helper.
Updating branch refs/heads/master
to 022bc7908523d36b4976668abf3c0f94e3e73a62 (commit)
from fe1a4ffa0b090d8c052240489bd5c5e54053b74f (commit)
commit 022bc7908523d36b4976668abf3c0f94e3e73a62
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sun Nov 14 17:46:31 2010 +0100
Use xfconf_channel_get in keyboards helper.
NEWS |4
xfce4-settings-helper/keyboards.c |6 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 2e35de9..41c7866 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+4.7.5
+=
+- Use xfconf_channel_get instead of xfconf_channel_new.
+
4.7.4
=
- Add X11/keysym.h include to keyboards.c (Bug #6778).
diff --git a/xfce4-settings-helper/keyboards.c
b/xfce4-settings-helper/keyboards.c
index 9c6c291..00f6040 100644
--- a/xfce4-settings-helper/keyboards.c
+++ b/xfce4-settings-helper/keyboards.c
@@ -99,7 +99,7 @@ xfce_keyboards_helper_init (XfceKeyboardsHelper *helper)
if (XkbQueryExtension (GDK_DISPLAY (), dummy, dummy, dummy, dummy,
dummy))
{
/* open the channel */
-helper-channel = xfconf_channel_new (keyboards);
+helper-channel = xfconf_channel_get (keyboards);
/* monitor channel changes */
g_signal_connect (G_OBJECT (helper-channel), property-changed,
G_CALLBACK (xfce_keyboards_helper_channel_property_changed), helper);
@@ -126,10 +126,6 @@ xfce_keyboards_helper_finalize (GObject *object)
/* Save the numlock state */
xfce_keyboards_helper_save_numlock_state (helper-channel);
-/* release the channel */
-if (G_LIKELY (helper-channel))
-g_object_unref (G_OBJECT (helper-channel));
-
(*G_OBJECT_CLASS (xfce_keyboards_helper_parent_class)-finalize) (object);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Remove all xfconf_channel_new occurrences.
Updating branch refs/heads/master
to e6fd9663822aad208e723ae665d037036815d3e5 (commit)
from 6c13ff5975a5c24a2019a47a5fdb23754b7238ff (commit)
commit e6fd9663822aad208e723ae665d037036815d3e5
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sun Nov 14 17:59:41 2010 +0100
Remove all xfconf_channel_new occurrences.
xfce4-settings-helper/accessibility.c |6 +-
xfce4-settings-helper/displays.c|6 +-
xfce4-settings-helper/keyboard-layout.c |6 +-
xfce4-settings-helper/pointers.c|6 +-
xfce4-settings-helper/workspaces.c |3 +--
5 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/xfce4-settings-helper/accessibility.c
b/xfce4-settings-helper/accessibility.c
index 4a7a13c..df46348 100644
--- a/xfce4-settings-helper/accessibility.c
+++ b/xfce4-settings-helper/accessibility.c
@@ -121,7 +121,7 @@ xfce_accessibility_helper_init (XfceAccessibilityHelper
*helper)
if (XkbQueryExtension (GDK_DISPLAY (), dummy, dummy, dummy, dummy,
dummy))
{
/* open the channel */
-helper-channel = xfconf_channel_new (accessibility);
+helper-channel = xfconf_channel_get (accessibility);
/* monitor channel changes */
g_signal_connect (G_OBJECT (helper-channel), property-changed,
G_CALLBACK (xfce_accessibility_helper_channel_property_changed), helper);
@@ -161,10 +161,6 @@ xfce_accessibility_helper_finalize (GObject *object)
notify_notification_close (helper-notification, NULL);
#endif /* !HAVE_LIBNOTIFY */
-/* release the channel */
-if (G_LIKELY (helper-channel))
-g_object_unref (G_OBJECT (helper-channel));
-
(*G_OBJECT_CLASS (xfce_accessibility_helper_parent_class)-finalize)
(object);
}
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 22f75ff..90783d8 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -127,7 +127,7 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
(major 1 || (major == 1 minor = 2)))
{
/* open the channel */
-helper-channel = xfconf_channel_new (displays);
+helper-channel = xfconf_channel_get (displays);
/* remove any leftover apply property before setting the monitor */
xfconf_channel_reset_property (helper-channel, /Schemes/Apply,
FALSE);
@@ -163,10 +163,6 @@ xfce_displays_helper_finalize (GObject *object)
{
XfceDisplaysHelper *helper = XFCE_DISPLAYS_HELPER (object);
-/* release the channel */
-if (G_LIKELY (helper-channel))
-g_object_unref (G_OBJECT (helper-channel));
-
(*G_OBJECT_CLASS (xfce_displays_helper_parent_class)-finalize) (object);
}
diff --git a/xfce4-settings-helper/keyboard-layout.c
b/xfce4-settings-helper/keyboard-layout.c
index 6c21b0a..3d7d3df 100644
--- a/xfce4-settings-helper/keyboard-layout.c
+++ b/xfce4-settings-helper/keyboard-layout.c
@@ -93,7 +93,7 @@ xfce_keyboard_layout_helper_init (XfceKeyboardLayoutHelper
*helper)
helper-channel = NULL;
/* open the channel */
-helper-channel = xfconf_channel_new (keyboard-layout);
+helper-channel = xfconf_channel_get (keyboard-layout);
/* monitor channel changes */
g_signal_connect (G_OBJECT (helper-channel), property-changed,
G_CALLBACK (xfce_keyboard_layout_helper_channel_property_changed), helper);
@@ -118,10 +118,6 @@ xfce_keyboard_layout_helper_finalize (GObject *object)
{
XfceKeyboardLayoutHelper *helper = XFCE_KEYBOARD_LAYOUT_HELPER (object);
-/* release the channel */
-if (G_LIKELY (helper-channel))
-g_object_unref (G_OBJECT (helper-channel));
-
(*G_OBJECT_CLASS (xfce_keyboard_layout_helper_parent_class)-finalize)
(object);
}
diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c
index 10c04c8..a67be7d 100644
--- a/xfce4-settings-helper/pointers.c
+++ b/xfce4-settings-helper/pointers.c
@@ -155,7 +155,7 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
else
{
/* open the channel */
-helper-channel = xfconf_channel_new (pointers);
+helper-channel = xfconf_channel_get (pointers);
/* restore the pointer devices */
xfce_pointers_helper_restore_devices (helper, NULL);
@@ -193,10 +193,6 @@ xfce_pointers_helper_finalize (GObject *object)
{
XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object);
-/* release the channel */
-if (G_LIKELY (helper-channel))
-g_object_unref (G_OBJECT (helper-channel));
-
(*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)-finalize) (object);
}
diff --git a/xfce4-settings-helper/workspaces.c
b/xfce4-settings-helper/workspaces.c
index b8de631..1c66e81 100644
--- a/xfce4-settings-helper/workspaces.c
+++ b/xfce4-settings-helper/workspaces.c
@@ -100,7 +100,7 @@ xfce_workspaces_helper_init (XfceWorkspacesHelper *helper)
GdkWindow*root_window;
[Xfce4-commits] ristretto:master Fix cleanup of settings object inside the preferences-dialog code Fix some indenting
Updating branch refs/heads/master
to af4fb7f3253e06ef884478cf454790ac876c612c (commit)
from 8ffd71d67ae57e7b90c53725c648d21d91323cf2 (commit)
commit af4fb7f3253e06ef884478cf454790ac876c612c
Author: Stephan Arts step...@xfce.org
Date: Sun Nov 14 20:11:59 2010 +0100
Fix cleanup of settings object inside the preferences-dialog code
Fix some indenting
src/preferences_dialog.c | 24 +---
src/thumbnailer.c|5 ++---
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 8455e20..fde5635 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -35,7 +35,10 @@
static void
rstto_preferences_dialog_init(RsttoPreferencesDialog *);
static void
-rstto_preferences_dialog_class_init(RsttoPreferencesDialogClass *);
+rstto_preferences_dialog_class_init(GObjectClass *);
+
+static void
+rstto_preferences_dialog_dispose (GObject *object);
static void
@@ -465,9 +468,24 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog
*dialog)
}
static void
-rstto_preferences_dialog_class_init(RsttoPreferencesDialogClass *dialog_class)
+rstto_preferences_dialog_class_init(GObjectClass *object_class)
+{
+parent_class = g_type_class_peek_parent (RSTTO_PREFERENCES_DIALOG_CLASS
(object_class));
+
+object_class-dispose = rstto_preferences_dialog_dispose;
+}
+
+static void
+rstto_preferences_dialog_dispose (GObject *object)
{
-parent_class = g_type_class_peek_parent (dialog_class);
+RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (object);
+if (dialog-priv-settings)
+{
+g_object_unref (dialog-priv-settings);
+dialog-priv-settings = NULL;
+}
+
+G_OBJECT_CLASS(parent_class)-dispose(object);
}
GtkWidget *
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index c742829..721e98f 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -96,8 +96,8 @@ struct _RsttoThumbnailerPriv
{
DBusGConnection *connection;
DBusGProxy*proxy;
-GSList *queue;
-gint handle;
+GSList*queue;
+gint handle;
gint request_timer_id;
};
@@ -246,7 +246,6 @@ rstto_thumbnailer_queue_image (RsttoThumbnailer
*thumbnailer, RsttoImage *image)
G_TYPE_INVALID) == FALSE);
thumbnailer-priv-handle = 0;
}
-
}
if (g_slist_find (thumbnailer-priv-queue, image) == NULL)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Save thumbnailbar width, and restore it correctly
Updating branch refs/heads/master
to 6d31c21c2fc76ef04ac9a62f27adee01b2df8182 (commit)
from af4fb7f3253e06ef884478cf454790ac876c612c (commit)
commit 6d31c21c2fc76ef04ac9a62f27adee01b2df8182
Author: Stephan Arts step...@xfce.org
Date: Sun Nov 14 22:00:57 2010 +0100
Save thumbnailbar width, and restore it correctly
src/main_window.c | 79 +
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index 49c0b9a..2e61084 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -127,6 +127,9 @@ static void
rstto_main_window_class_init(RsttoMainWindowClass *);
static void
rstto_main_window_dispose(GObject *object);
+static void
+rstto_main_window_size_allocate (GtkWidget *, GtkAllocation *);
+
static void
rstto_main_window_set_property (GObject *object,
@@ -258,6 +261,8 @@ rstto_main_window_set_navigationbar_position
(RsttoMainWindow *window, guint ori
static void
cb_rstto_main_window_vpaned_pos_changed (GtkWidget *widget, gpointer
user_data);
+static void
+cb_rstto_main_window_hpaned_pos_changed (GtkWidget *widget, gpointer
user_data);
static GtkWidgetClass *parent_class = NULL;
@@ -650,11 +655,11 @@ rstto_main_window_init (RsttoMainWindow *window)
g_signal_connect(G_OBJECT(window-priv-settings_manager), notify,
G_CALLBACK(cb_rstto_main_window_settings_notify), window);
+g_signal_connect(G_OBJECT(window-priv-hpaned_left), accept-position,
G_CALLBACK(cb_rstto_main_window_hpaned_pos_changed), window);
+g_signal_connect(G_OBJECT(window-priv-hpaned_right), accept-position,
G_CALLBACK(cb_rstto_main_window_hpaned_pos_changed), window);
g_signal_connect(G_OBJECT(window-priv-vpaned_top), accept-position,
G_CALLBACK(cb_rstto_main_window_vpaned_pos_changed), window);
g_signal_connect(G_OBJECT(window-priv-vpaned_bottom), accept-position,
G_CALLBACK(cb_rstto_main_window_vpaned_pos_changed), window);
-gtk_paned_set_position (GTK_PANED(window-priv-vpaned_top),
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
-gtk_paned_set_position (GTK_PANED(window-priv-vpaned_bottom),
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
}
static void
@@ -663,6 +668,8 @@ rstto_main_window_class_init(RsttoMainWindowClass
*window_class)
GParamSpec *pspec;
GObjectClass *object_class = (GObjectClass*)window_class;
+GtkWidgetClass *widget_class = (GtkWidgetClass *)window_class;
+
parent_class = g_type_class_peek_parent(window_class);
object_class-dispose = rstto_main_window_dispose;
@@ -670,6 +677,8 @@ rstto_main_window_class_init(RsttoMainWindowClass
*window_class)
object_class-set_property = rstto_main_window_set_property;
object_class-get_property = rstto_main_window_get_property;
+widget_class-size_allocate = rstto_main_window_size_allocate;
+
pspec = g_param_spec_object (image_list,
,
,
@@ -682,6 +691,29 @@ rstto_main_window_class_init(RsttoMainWindowClass
*window_class)
}
static void
+rstto_main_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+{
+RsttoMainWindow *window = RSTTO_MAIN_WINDOW(widget);
+GtkRequisition panel_requisition;
+
+GTK_WIDGET_CLASS (parent_class)-size_allocate(widget, allocation);
+
+gtk_widget_size_request (window-priv-vpaned_top, panel_requisition);
+
+
+/* if the panel-position is unset, set it */
+if (gtk_paned_get_position (GTK_PANED(window-priv-vpaned_top)) == 0)
+{
+g_debug (set size);
+gtk_paned_set_position (GTK_PANED(window-priv-vpaned_top),
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
+gtk_paned_set_position (GTK_PANED(window-priv-vpaned_bottom),
window-priv-vpaned_bottom-allocation.height -
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
+
+gtk_paned_set_position (GTK_PANED(window-priv-hpaned_left),
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
+gtk_paned_set_position (GTK_PANED(window-priv-hpaned_right),
window-priv-hpaned_right-allocation.width -
rstto_settings_get_uint_property(window-priv-settings_manager,
thumbnailbar-size));
+}
+}
+
+static void
rstto_main_window_dispose(GObject *object)
{
RsttoMainWindow *window = RSTTO_MAIN_WINDOW(object);
@@ -704,7 +736,8 @@ rstto_main_window_dispose(GObject *object)
case 1:
rstto_settings_set_int_property
(window-priv-settings_manager,
thumbnailbar-size,
-gtk_paned_get_position
(GTK_PANED(window-priv-hpaned_right)));
+
GTK_WIDGET(window-priv-hpaned_right)-allocation.width -
+
[Xfce4-commits] tumbler:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 60d54cae4708c09771829dfa7f0643dd6b82860e (commit) from 268ee498ea4060f09d19a29b7c4dab3e69f234b0 (commit) commit 60d54cae4708c09771829dfa7f0643dd6b82860e Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Mon Nov 15 06:00:00 2010 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 47 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 28 +++- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/po/kk.po b/po/kk.po index acf2bf4..1fb09e6 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov baurthefi...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 14:22+0100\n +POT-Creation-Date: 2010-11-14 23:01+\n PO-Revision-Date: 2010-03-11 12:52+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n -Language: kk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: kk\n Plural-Forms: nplurals=1; plural=0\n #: ../tumblerd/tumbler-cache-service.c:383 @@ -59,12 +59,8 @@ msgstr \%s\ секциясы қате, ол \%s\ файлында: %s #: ../tumblerd/tumbler-manager.c:526 #, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -\%s\ секциясы қате, ол \%s\ файлында: Секция аты мен UriScheme/MimeType -арасында сәйкестік жоқ +msgid Malformed section \%s\ in file \%s\: Mismatch between section name and UriScheme/MimeType +msgstr \%s\ секциясы қате, ол \%s\ файлында: Секция аты мен UriScheme/MimeType арасында сәйкестік жоқ #: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900 #: ../tumblerd/tumbler-manager.c:914 @@ -160,12 +156,10 @@ msgid Version mismatch: %s msgstr Нұсқасы сәйкес емес: %s #: ../plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:62 -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:62 msgid Initializing the Tumbler Pixbuf Thumbnailer plugin msgstr Tumbler Pixbuf Thumbnailer плагинді қосу #: ../plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:79 -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:79 #: ../plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c:79 msgid Shutting down the Tumbler Pixbuf Thumbnailer plugin msgstr Tumbler Pixbuf Thumbnailer плагинді сөндіру @@ -208,14 +202,22 @@ msgstr Таңбалар кестесін орнату мүмкін емес: %s msgid Could not render glyphs: %s msgstr Глифтерді өндеу мүмкін емес: %s -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:743 -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:781 +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:746 +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:784 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c:210 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c:227 #, c-format msgid Thumbnail could not be inferred from file contents msgstr Таңбаша файл құрамасынан алынуы мүмкін емес +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:62 +msgid Initializing the Tumbler JPEG Thumbnailer plugin +msgstr Tumbler JPEG Thumbnailer плагинін іске қосу + +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:79 +msgid Shutting down the Tumbler JPEG Thumbnailer plugin +msgstr Tumbler JPEG Thumbnailer плагинін сөндіру + #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:63 msgid Initializing the Tumbler ffmpeg video thumbnailer plugin msgstr Tumbler ffmpeg видео thumbnailer плагинді қосу ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Remove LINGUAS
Updating branch refs/heads/master to c6353cde046c1802f8aa688649af61c10ce1a1c4 (commit) from 14431e77095bf89a3987a7dca871b820d073c0d0 (commit) commit c6353cde046c1802f8aa688649af61c10ce1a1c4 Author: Stephan Arts step...@xfce.org Date: Mon Nov 15 06:31:34 2010 +0100 Remove LINGUAS po/LINGUAS |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 2934cef..000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ar ast bg ca cs da de el en_GB es eu fi fr gl hu id it ja lv nb nl pl pt_BR pt ru sk sv tr uk ur ur_PK zh_CN ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master update autogen.sh
Updating branch refs/heads/master
to 62e18e38ac8eb1db15009c2c6a1a044c5655ae47 (commit)
from c6353cde046c1802f8aa688649af61c10ce1a1c4 (commit)
commit 62e18e38ac8eb1db15009c2c6a1a044c5655ae47
Author: Stephan Arts step...@xfce.org
Date: Mon Nov 15 06:33:55 2010 +0100
update autogen.sh
autogen.sh | 34 +++---
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index f370893..ef98c52 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,27 @@
#!/bin/sh
#
-# $Id: autogen.sh 22391 2006-07-10 12:54:50Z benny $
+# $Id$
#
-# Copyright (c) 2002-2006
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
-# Written for Xfce by Benedikt Meurer be...@xfce.org.
+# Written for Xfce by Benedikt Meurer be...@xfce.org
+# and Brian Tarricone br...@tarricone.org.
#
+export XDT_AUTOGEN_REQUIRED_VERSION=4.7.0
+
(type xdt-autogen) /dev/null 21 || {
cat 2 EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-your system, which are required to build this software.
-Please install the xfce4-dev-tools package first, it is available
+autogen.sh: You don't seem to have the Xfce development tools (at least
+version $XDT_REQURED_VERSION) installed on your system, which
+are required to build this software.
+Please install the xfce4-dev-tools package first; it is available
from http://www.xfce.org/.
EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) /dev/null 21 || {
- cat 2 EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-exec xdt-autogen $@
+exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master update dutch translations
Updating branch refs/heads/master to 83c6c8c5be9cdb58c35e2d1a8b3046ae2bbcef8d (commit) from b0ee303cca52a86292602d60eaa7efdf1b6df436 (commit) commit 83c6c8c5be9cdb58c35e2d1a8b3046ae2bbcef8d Author: Stephan Arts step...@xfce.org Date: Mon Nov 15 07:12:00 2010 +0100 update dutch translations po/nl.po | 40 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7ef93ef..845d21f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -60,7 +60,7 @@ msgstr Map openen #: ../src/main_window.c:270 msgid _Save copy -msgstr Kopie Opslaan +msgstr Kopie Op_slaan #: ../src/main_window.c:270 msgid Save a copy of the image @@ -72,7 +72,7 @@ msgstr _Print #: ../src/main_window.c:271 msgid Print the image -msgstr _Afbeelding printen +msgstr Afbeelding printen #: ../src/main_window.c:272 msgid _Close @@ -88,7 +88,7 @@ msgstr _Alles Sluiten #: ../src/main_window.c:273 msgid Close all images -msgstr _Alle afbeeldingen sluiten +msgstr Alle afbeeldingen sluiten #: ../src/main_window.c:274 msgid _Quit @@ -122,7 +122,7 @@ msgstr _Voorkeuren #. View Menu #: ../src/main_window.c:282 msgid _View -msgstr _Beeld +msgstr Beel_d #: ../src/main_window.c:283 #, fuzzy @@ -153,7 +153,7 @@ msgstr _Uitzoomen #: ../src/main_window.c:290 msgid Zoom _Fit -msgstr +msgstr _Passend maken #: ../src/main_window.c:291 msgid _Normal Size @@ -271,9 +271,8 @@ msgid _Recently used msgstr _Recent geopend #: ../src/main_window.c:445 -#, fuzzy msgid Recently used -msgstr _Recent geopend +msgstr Recent geopend #: ../src/main_window.c:532 ../src/main_window.c:826 msgid Press open to select an image @@ -294,7 +293,8 @@ msgstr #: ../src/main_window.c:1627 msgid translator-credits -msgstr Timo Verbeek timoverbee...@hotmail.com +msgstr +Timo Verbeek timoverbee...@hotmail.com\nStephan Artsstep...@xfce.org #: ../src/main_window.c:1942 msgid Open image @@ -359,7 +359,6 @@ msgstr diaweergave (in seconden) #: ../src/preferences_dialog.c:290 -#, fuzzy msgid Thumbnails msgstr Miniaturen @@ -373,7 +372,7 @@ msgstr #: ../src/preferences_dialog.c:295 msgid Hide thumbnailbar when fullscreen -msgstr Miniaturen _verbergen bij volledig scherm mode +msgstr Miniaturen verbergen bij volledig scherm mode #: ../src/preferences_dialog.c:308 msgid Control @@ -392,7 +391,6 @@ msgid Zoom in and out msgstr In-en uitzoomen #: ../src/preferences_dialog.c:322 -#, fuzzy msgid Switch images msgstr Afbeeldingen wisselen @@ -415,9 +413,8 @@ msgid Startup msgstr Opstarten #: ../src/preferences_dialog.c:372 -#, fuzzy msgid Resize window to image on startup -msgstr Resize venster naar afbeelding bij het opstarten +msgstr Venstergrootte aan afbeelding aanpassen bij het opstarten #: ../src/preferences_dialog.c:376 msgid Open entire folder on startup @@ -472,9 +469,8 @@ msgid Brightness: msgstr #: ../src/xfce_wallpaper_manager.c:91 -#, fuzzy msgid Saturation: -msgstr _Rotatie +msgstr Verzadiging: #: ../src/xfce_wallpaper_manager.c:123 msgid Auto @@ -485,22 +481,20 @@ msgid Centered msgstr Gecentreerd #: ../src/xfce_wallpaper_manager.c:125 -#, fuzzy msgid Tiled msgstr Als Tegels #: ../src/xfce_wallpaper_manager.c:126 msgid Stretched -msgstr +msgstr Uitgerekt #: ../src/xfce_wallpaper_manager.c:127 msgid Scaled msgstr Schalen #: ../src/xfce_wallpaper_manager.c:128 -#, fuzzy msgid Zoomed -msgstr Ingezoomt +msgstr Ingezoomd #: ../src/thumbnail_bar.c:187 msgid Spacing @@ -512,21 +506,19 @@ msgstr De ruimte tussen de miniaturen #: ../src/thumbnail_bar.c:194 msgid border width -msgstr rand breedte +msgstr randbreedte #: ../src/thumbnail_bar.c:195 msgid the border width of the thumbnail-bar msgstr de randbreedte van de miniaturen balk #: ../src/thumbnail_bar.c:201 -#, fuzzy msgid filmstrip width -msgstr filmstrip breedte +msgstr Miniaturenbalkbreedte #: ../src/thumbnail_bar.c:202 -#, fuzzy msgid the width of the thumbnail-bar film-strip -msgstr De breedte van de miniaturen balk +msgstr De breedte van de miniaturenbalk #: ../ristretto.desktop.in.h:1 msgid Image Viewer ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Migrate ristretto to libxfce4ui. - Thanks to Romain Bouvier skun...@archlinux.fr, who provided a patch.
Updating branch refs/heads/master
to b0ee303cca52a86292602d60eaa7efdf1b6df436 (commit)
from 62e18e38ac8eb1db15009c2c6a1a044c5655ae47 (commit)
commit b0ee303cca52a86292602d60eaa7efdf1b6df436
Author: Stephan Arts step...@xfce.org
Date: Mon Nov 15 07:10:43 2010 +0100
Migrate ristretto to libxfce4ui.
- Thanks to Romain Bouvier skun...@archlinux.fr, who provided a patch.
configure.in.in | 16
src/Makefile.am |4 ++--
src/main_window.c|6 ++
src/preferences_dialog.c | 16
src/thumbnail_bar.c |2 +-
5 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 5d59252..ceb59a4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -52,16 +52,16 @@ dnl Check for i18n support
XDT_I18N([...@linguas@])
XDT_CHECK_PACKAGE([LIBEXIF], [libexif], [0.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.8.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index 82c6bf7..dd1fc5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ ristretto_CFLAGS = \
$(XFCONF_CFLAGS) \
$(CAIRO_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
-DDATADIR=\$(datadir)\ \
-DSRCDIR=\$(top_srcdir)\ \
-DLOCALEDIR=\$(localedir)\
@@ -43,7 +43,7 @@ ristretto_LDADD = \
$(CAIRO_LIBS) \
$(XFCONF_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCEGUI4_LIBS) -lX11
+ $(LIBXFCE4UI_LIBS) -lX11
INCLUDES = \
-I${top_srcdir}
diff --git a/src/main_window.c b/src/main_window.c
index 2e61084..029ca7c 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -12,9 +12,7 @@
* GNU Library 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.
- */
+ * along with this program; if not, write to the Free Software * Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include config.h
#include gtk/gtk.h
@@ -24,7 +22,7 @@
#include gio/gio.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
#include libexif/exif-data.h
#include cairo/cairo.h
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index fde5635..738f005 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -18,7 +18,7 @@
#include config.h
#include gtk/gtk.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
#include libxfce4util/libxfce4util.h
#include settings.h
@@ -224,7 +224,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog
*dialog)
/** Bg-color frame */
dialog-priv-display_tab.bgcolor_vbox = gtk_vbox_new (FALSE, 0);
-dialog-priv-display_tab.bgcolor_frame =
xfce_create_framebox_with_content (_(Background color),
+dialog-priv-display_tab.bgcolor_frame =
xfce_gtk_frame_box_new_with_content(_(Background color),
dialog-priv-display_tab.bgcolor_vbox);
gtk_box_pack_start (GTK_BOX (display_main_vbox),
dialog-priv-display_tab.bgcolor_frame, FALSE, FALSE, 0);
@@ -269,7 +269,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog
*dialog)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), slideshow_main_vbox,
slideshow_main_lbl);
dialog-priv-slideshow_tab.timeout_vbox = gtk_vbox_new(FALSE, 0);
-dialog-priv-slideshow_tab.timeout_frame =
xfce_create_framebox_with_content (_(Timeout),
dialog-priv-slideshow_tab.timeout_vbox);
+dialog-priv-slideshow_tab.timeout_frame =
xfce_gtk_frame_box_new_with_content(_(Timeout),
dialog-priv-slideshow_tab.timeout_vbox);
gtk_box_pack_start (GTK_BOX (slideshow_main_vbox),
dialog-priv-slideshow_tab.timeout_frame, FALSE, FALSE, 0);
timeout_lbl = gtk_label_new(_(The time period an individual image is
[Xfce4-commits] xfce4-notes-plugin:master Add configurable notes path
Updating branch refs/heads/master
to f5d46e944af70a9295936e92713120c1717a822d (commit)
from c75e25ed238cdecc1e4149c96739ba3b6444 (commit)
commit f5d46e944af70a9295936e92713120c1717a822d
Author: Mike Massonnet mmasson...@xfce.org
Date: Mon Nov 15 07:41:36 2010 +0100
Add configurable notes path
Xnp.Application has a new notes-path property that can be tweaked
through Xfconf. The new directory must be writable and empty.
Added a directory button inside the settings dialog to choose the new
notes path.
lib/application.vala | 68 ---
src/xfce4-notes-settings.c | 66 ++-
2 files changed, 122 insertions(+), 12 deletions(-)
diff --git a/lib/application.vala b/lib/application.vala
index df4414f..1f45804 100644
--- a/lib/application.vala
+++ b/lib/application.vala
@@ -25,17 +25,11 @@ namespace Xnp {
public class Application : GLib.Object {
private SListXnp.Window window_list;
- private string notes_path;
+ public string notes_path { get; set construct; }
public string config_file { get; construct; }
private Xfconf.Channel xfconf_channel;
construct {
- notes_path = %s/notes.printf
(GLib.Environment.get_user_data_dir ());
- }
-
- public Application (string config_file) {
- GLib.Object (config_file: config_file);
-
var notesgtkrc = %s/xfce4/xfce4-notes.gtkrc.printf
(GLib.Environment.get_user_config_dir ());
Gtk.rc_parse (notesgtkrc);
@@ -56,19 +50,27 @@ namespace Xnp {
}
xfconf_channel = new Xfconf.Channel.with_property_base
(xfce4-panel, /plugins/notes);
- update_color ();
+ update_color ();
xfconf_channel.property_changed[/global/background-color].connect (() = {
update_color ();
});
-
Gtk.Settings.get_default
().notify[gtk-theme-name].connect (() = {
update_color ();
});
+ if (notes_path == null) {
+ var default_path = %s/notes.printf
(GLib.Environment.get_user_data_dir ());
+ notes_path = xfconf_channel.get_string
(/global/notes-path, default_path);
+ }
+
xfconf_channel.property_changed[/global/notes-path].connect (() = {
+ update_notes_path ();
+ });
+
string name;
bool found = false;
try {
+ /* Load existing windows */
var dir = Dir.open (notes_path, 0);
while ((name = dir.read_name ()) != null) {
create_window (name);
@@ -79,10 +81,19 @@ namespace Xnp {
GLib.DirUtils.create_with_parents (notes_path,
0700);
}
if (found == false) {
+ /* Create first-run window */
create_window ();
}
}
+ public Application (string config_file) {
+ GLib.Object (config_file: config_file);
+ }
+
+ public Application.with_notes_path (string config_file, string
notes_path) {
+ GLib.Object (config_file: config_file, notes_path:
notes_path);
+ }
+
~Application () {
save_windows_configuration ();
xfconf_channel = null;
@@ -93,6 +104,41 @@ namespace Xnp {
}
}
+ private void update_notes_path () {
+ var new_notes_path = xfconf_channel.get_string
(/global/notes-path, notes_path);
+ if (notes_path == new_notes_path) {
+ return;
+ }
+
+ /* Check that the new path is empty */
+ try {
+ var dir = Dir.open (new_notes_path, 0);
+ if (dir.read_name () != null) {
+ var error_dialog = new
Gtk.MessageDialog (null, 0, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
+ _(Select notes path));
+ error_dialog.format_secondary_text
(_(The selected directory (%s) for the new notes path already contains files.
You must select or create an
