[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to b5ba0bda3f49589aba21359947306e377e2fdba5 (commit) from 59c5c279c61a514ec3baf622faf51dc2e819fdbc (commit) commit b5ba0bda3f49589aba21359947306e377e2fdba5 Author: Sergio Marques smarque...@gmail.com Date: Tue Apr 2 10:53:31 2013 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 353 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 43 +-- 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/po/pt.po b/po/pt.po index db30cb9..eb7c48b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-03-18 12:24+\n +POT-Creation-Date: 2013-04-02 05:30+\n PO-Revision-Date: 2012-04-27 15:49+0100\n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: \n @@ -227,21 +227,21 @@ msgid pixels/sec msgstr pixeis/seg #: ../dialogs/accessibility-settings/main.c:43 -#: ../dialogs/appearance-settings/main.c:94 +#: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:137 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid Settings manager socket msgstr Socket do gestor de definições #: ../dialogs/accessibility-settings/main.c:43 -#: ../dialogs/appearance-settings/main.c:94 +#: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:137 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid SOCKET ID msgstr ID de SOCKET #: ../dialogs/accessibility-settings/main.c:44 -#: ../dialogs/appearance-settings/main.c:95 +#: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:138 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 @@ -250,7 +250,7 @@ msgid Version information msgstr Informações da versão #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:966 +#: ../dialogs/appearance-settings/main.c:1006 #: ../dialogs/display-settings/main.c:1943 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 @@ -260,7 +260,7 @@ msgid Type '%s --help' for usage. msgstr Digite '%s --help' para informações de utilização. #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:985 +#: ../dialogs/appearance-settings/main.c:1025 #: ../dialogs/display-settings/main.c:1962 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 @@ -269,7 +269,7 @@ msgid The Xfce development team. All rights reserved. msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados. #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:986 +#: ../dialogs/appearance-settings/main.c:1026 #: ../dialogs/display-settings/main.c:1963 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 @@ -380,7 +380,7 @@ msgid Menus and Buttons msgstr Menus e botões #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20 -#: ../dialogs/appearance-settings/main.c:852 +#: ../dialogs/appearance-settings/main.c:892 #: ../dialogs/display-settings/main.c:103 #: ../dialogs/display-settings/main.c:114 msgid None @@ -482,45 +482,52 @@ msgstr Í_cones msgid _Toolbar Style msgstr Es_tilo da barra de ferramentas -#: ../dialogs/appearance-settings/main.c:733 +#: ../dialogs/appearance-settings/main.c:355 +#, c-format +msgid +Warning: this icon theme has no cache file. You can create this by running +igtk-update-icon-cache %s/%s//i in a terminal emulator. +msgstr Aviso: este tema de ´ícones não tem ficheiro de cache. Pode criar o ficheiro como o comando igtk-update-icon-cache %s/%s//i no emulador de terminal. + +#: ../dialogs/appearance-settings/main.c:765 #, c-format msgid File is larger than %d MB, installation aborted msgstr O ficheiro é superior a %d Mbs, instalação cancelada -#: ../dialogs/appearance-settings/main.c:738 +#: ../dialogs/appearance-settings/main.c:770 msgid Failed to create temporary directory msgstr Ocorreu um erro ao criar o diretório temporário -#: ../dialogs/appearance-settings/main.c:743 +#: ../dialogs/appearance-settings/main.c:775 msgid Failed to extract archive msgstr Ocorreu um erro ao extrair o ficheiro -#: ../dialogs/appearance-settings/main.c:748 +#: ../dialogs/appearance-settings/main.c:780 msgid Unknown format, only archives and directories are supported msgstr O formato não é conhecido. Só são suportados arquivos e diretórios. -#:
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 76546eebe70dde4bd06d0f63fa835e764a0d79fa (commit) from b5ba0bda3f49589aba21359947306e377e2fdba5 (commit) commit 76546eebe70dde4bd06d0f63fa835e764a0d79fa Author: Sergio Marques smarque...@gmail.com Date: Tue Apr 2 10:54:59 2013 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 353 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt.po b/po/pt.po index eb7c48b..2975922 100644 --- a/po/pt.po +++ b/po/pt.po @@ -487,7 +487,7 @@ msgstr Es_tilo da barra de ferramentas msgid Warning: this icon theme has no cache file. You can create this by running igtk-update-icon-cache %s/%s//i in a terminal emulator. -msgstr Aviso: este tema de ´ícones não tem ficheiro de cache. Pode criar o ficheiro como o comando igtk-update-icon-cache %s/%s//i no emulador de terminal. +msgstr Aviso: este tema de ícones não tem ficheiro de cache. Pode criar o ficheiro como o comando igtk-update-icon-cache %s/%s//i no emulador de terminal. #: ../dialogs/appearance-settings/main.c:765 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 54de0fb5c2c75ccc903bc0d20b625d56a3b56c0d (commit) from 76546eebe70dde4bd06d0f63fa835e764a0d79fa (commit) commit 54de0fb5c2c75ccc903bc0d20b625d56a3b56c0d Author: Sergio Marques smarque...@gmail.com Date: Tue Apr 2 10:56:04 2013 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 353 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt.po b/po/pt.po index 2975922..4a14891 100644 --- a/po/pt.po +++ b/po/pt.po @@ -423,7 +423,7 @@ msgstr Especifica o que deve ser exibido nos itens da barra de ferramentas #: ../dialogs/appearance-settings/appearance-dialog.glade.h:29 msgid Specify whether icons should be displayed next to items in menus -msgstr Especifica se os ícones devem ser exibidos junto aos itens nos menus +msgstr Especifica se, nos menus, os ícones devem ser exibidos junto aos itens #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30 msgid Specify whether icons should be displayed next to text in buttons ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Build system: Remove check for libresolv.
Updating branch refs/heads/master to 5772b85b53fe906c52f68f9a507d19b9f34078ef (commit) from 20f99778941f73053020b77185b337417615fed1 (commit) commit 5772b85b53fe906c52f68f9a507d19b9f34078ef Author: Harald Judt h.j...@gmx.at Date: Tue Apr 2 13:49:52 2013 +0200 Build system: Remove check for libresolv. configure.ac.in |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index d95bab0..fb16b7c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -68,8 +68,6 @@ XDT_CHECK_PACKAGE([SOUP], [libsoup-2.4], [2.26.0]) XDT_CHECK_OPTIONAL_PACKAGE([UPOWER_GLIB], [upower-glib], [0.9.0], [upower], [upower for adapting update interval to power state]) -AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv]) -AC_SUBST(LIBRESOLV) dnl dnl *** Special compile time options *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master makedist: Make gstreamer version switchable.
Updating branch refs/heads/master to 04a37a8fb427cb30ad346c4157b1feee2f183b75 (commit) from 3b6cfde8306aece485f37e36698eb9153163ef45 (commit) commit 04a37a8fb427cb30ad346c4157b1feee2f183b75 Author: Paweł Forysiuk tuxa...@o2.pl Date: Tue Apr 2 23:15:35 2013 +0200 makedist: Make gstreamer version switchable. win32/makedist/makedist.midori |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori index e58b9ee..38114a3 100755 --- a/win32/makedist/makedist.midori +++ b/win32/makedist/makedist.midori @@ -24,6 +24,10 @@ # a bit of configuration root_dir=$MINGW_PREFIX +if [ $GSTREAMER_API_VERSION == ]; then +GSTREAMER_API_VERSION=0.10 +fi + if [ $MINGW_PREFIX == ]; then echo Error: MINGW_PREFIX variable is empty! exit @@ -115,7 +119,7 @@ pushd $root_dir/bin /dev/null dll_recursive midori*.exe gspawn-*-helper*.exe libhunspell*.dll $temp_dir/midori.exe.lst dll_recursive ../lib/gio/modules/*.dll $temp_dir/midori.exe.lst dll_recursive iconv.dll $temp_dir/midori.exe.lst -dll_recursive ../lib/gstreamer-0.10/*.dll $temp_dir/midori.exe.lst +dll_recursive ../lib/gstreamer-$GSTREAMER_API_VERSION/*.dll $temp_dir/midori.exe.lst if [ $DEBUG_BUILD != ]; then dll_recursive gdb.exe GtkLauncher.exe $temp_dir/midori.exe.lst @@ -172,7 +176,7 @@ grab_files lib gio # Fedora ships on-demand pango modules, check just in case grab_files lib pango -grab_files lib gstreamer-0.10 +grab_files lib gstreamer-$GSTREAMER_API_VERSION echo * Copying resources and translations... ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Update tabs being closable on setting change in Granite
Updating branch refs/heads/master
to 63f5230dbbd893b6fd5acc6bb2dc8dcbf17d43c9 (commit)
from 04a37a8fb427cb30ad346c4157b1feee2f183b75 (commit)
commit 63f5230dbbd893b6fd5acc6bb2dc8dcbf17d43c9
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Apr 3 00:15:11 2013 +0200
Update tabs being closable on setting change in Granite
midori/midori-browser.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index a827530..a997f7f 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6960,6 +6960,11 @@ midori_browser_settings_notify (MidoriWebSettings*
web_settings,
}
else if (name == g_intern_string (maximum-history-age))
browser-maximum_history_age = g_value_get_int (value);
+#ifdef HAVE_GRANITE
+else if (name == g_intern_string (close-buttons-on-tabs))
+granite_widgets_dynamic_notebook_set_tabs_closable (
+GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser-notebook),
g_value_get_boolean (value));
+#endif
else if (name == g_intern_string (close-buttons-left))
{
midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser-find),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Duplicate current URI when reloading Midori.View
Updating branch refs/heads/master
to 6e22ef9b349cf22c88282ed7514b3f33968a41c1 (commit)
from 63f5230dbbd893b6fd5acc6bb2dc8dcbf17d43c9 (commit)
commit 6e22ef9b349cf22c88282ed7514b3f33968a41c1
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Apr 3 00:55:57 2013 +0200
Duplicate current URI when reloading Midori.View
midori/midori-view.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index e6d4876..f614170 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5250,7 +5250,12 @@ midori_view_reload (MidoriView* view,
g_return_if_fail (MIDORI_IS_VIEW (view));
if (midori_tab_is_blank (MIDORI_TAB (view)))
-midori_view_set_uri (view, midori_tab_get_uri (MIDORI_TAB (view)));
+{
+/* Duplicate here because the URI pointer might change */
+gchar* uri = g_strdup (midori_tab_get_uri (MIDORI_TAB (view)));
+midori_view_set_uri (view, uri);
+g_free (uri);
+}
else if (from_cache)
webkit_web_view_reload (WEBKIT_WEB_VIEW (view-web_view));
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Set about:dial URI and explicitly convert to for display
Updating branch refs/heads/master to d423123dd32eca23043c548599743c40150c44c8 (commit) from 6e22ef9b349cf22c88282ed7514b3f33968a41c1 (commit) commit d423123dd32eca23043c548599743c40150c44c8 Author: Christian Dywan christ...@twotoasts.de Date: Wed Apr 3 01:04:56 2013 +0200 Set about:dial URI and explicitly convert to for display midori/midori-view.c |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index f614170..2f28a83 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4118,13 +4118,13 @@ midori_view_set_uri (MidoriView* view, timer = g_timer_new (); #endif -midori_tab_set_uri (MIDORI_TAB (view), about:blank); +midori_tab_set_uri (MIDORI_TAB (view), uri); midori_tab_set_mime_type (MIDORI_TAB (view), text/html); katze_item_set_meta_string (view-item, mime-type, text/html); katze_item_set_meta_integer (view-item, delay, MIDORI_DELAY_UNDELAYED); html = dial != NULL ? midori_speed_dial_get_html (dial, NULL) : ; -midori_view_set_html (view, html, NULL, NULL); +midori_view_set_html (view, html, uri, NULL); #ifdef G_ENABLE_DEBUG if (midori_debug (startup)) @@ -4454,7 +4454,9 @@ midori_view_get_display_uri (MidoriView* view) uri = midori_tab_get_uri (MIDORI_TAB (view)); /* Something in the stack tends to turn into about:blank. Yet for practical purposes we prefer . */ -if (!strcmp (uri, about:blank) || !strcmp (uri, about:private)) +if (!strcmp (uri, about:blank) + || !strcmp (uri, about:dial) + || !strcmp (uri, about:private)) return ; return uri; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Treat failed load the same as finished
Updating branch refs/heads/master to 5876dbfd1138b37ca2b61c8f711fcbbd4ea34e09 (commit) from d423123dd32eca23043c548599743c40150c44c8 (commit) commit 5876dbfd1138b37ca2b61c8f711fcbbd4ea34e09 Author: Christian Dywan christ...@twotoasts.de Date: Wed Apr 3 01:06:40 2013 +0200 Treat failed load the same as finished Fixes: https://bugs.launchpad.net/midori/+bug/1162086 midori/midori-view.c |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 2f28a83..a292e4c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1561,10 +1561,8 @@ midori_view_web_view_notify_load_status_cb (WebKitWebView* web_view, /* Not implemented */ break; case WEBKIT_LOAD_FINISHED: -midori_view_load_finished (view); -break; case WEBKIT_LOAD_FAILED: -/* Not implemented */ +midori_view_load_finished (view); break; default: g_warn_if_reached (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Never pass NULL as keyboard model to xklavier
Updating branch refs/heads/4.10_panel_support to feac42fd57d75680f1dfbdfc9142c859cbd01735 (commit) from 93f3b95ec40fef08f96920d1ef0924c8891c608e (commit) commit feac42fd57d75680f1dfbdfc9142c859cbd01735 Author: Igor Slepchin igor.slepc...@gmail.com Date: Sat Mar 30 02:30:19 2013 -0400 Never pass NULL as keyboard model to xklavier Otherwise, the call to XkbRF_GetComponents will fail later on and activating the new xkb settings will fail too. panel-plugin/xkb-config.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c index 13656bd..23353c2 100644 --- a/panel-plugin/xkb-config.c +++ b/panel-plugin/xkb-config.c @@ -346,7 +346,7 @@ xkb_config_update_settings (t_xkb_settings *settings) activate_settings = TRUE; g_free (config-config_rec-model); -config-config_rec-model = g_strdup (settings-kbd_config-model); +config-config_rec-model = g_strdup (settings-kbd_config-model ? settings-kbd_config-model : ); g_strfreev (config-config_rec-layouts); config-config_rec-layouts = g_strsplit_set (settings-kbd_config-layouts, ,, 0); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Check if getting/setting xkl config returns error
Updating branch refs/heads/4.10_panel_support
to eaf0e5136c657cb1d040a01d3f1692b5b81373f9 (commit)
from feac42fd57d75680f1dfbdfc9142c859cbd01735 (commit)
commit eaf0e5136c657cb1d040a01d3f1692b5b81373f9
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Mon Apr 1 15:56:12 2013 -0400
Check if getting/setting xkl config returns error
panel-plugin/xkb-config.c | 11 +--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 23353c2..3d1a26c 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -310,7 +310,10 @@ xkb_config_update_settings (t_xkb_settings *settings)
if (settings-kbd_config == NULL || settings-never_modify_config)
{
-xkl_config_rec_get_from_server (config-config_rec, config-engine);
+if (!xkl_config_rec_get_from_server (config-config_rec,
config-engine))
+{
+DBG (ERROR: can't get xkl config: [%s], xkl_get_last_error());
+}
if (settings-kbd_config == NULL)
settings-kbd_config = g_new0 (t_xkb_kbd_config, 1);
@@ -398,7 +401,11 @@ xkb_config_update_settings (t_xkb_settings *settings)
if (activate_settings !settings-never_modify_config)
{
ignore_xkl_config_change = TRUE;
-xkl_config_rec_activate (config-config_rec, config-engine);
+if (!xkl_config_rec_activate (config-config_rec, config-engine))
+{
+DBG (ERROR: can't activate xkl config: [%s],
xkl_get_last_error());
+// FIXME: we should probably try to reload from xkl config here
+}
ignore_xkl_config_change = FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Fix prototypes of X-state-changed and X-config-changed callbacks. (cherry picked from commit a29286c138b5bf6d041c099237b34ffad24eff12)
Updating branch refs/heads/4.10_panel_support
to 8e661ce85c9200286e6aa0cc12514e4fb4203b5f (commit)
from eaf0e5136c657cb1d040a01d3f1692b5b81373f9 (commit)
commit 8e661ce85c9200286e6aa0cc12514e4fb4203b5f
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Jul 17 17:46:25 2012 -0400
Fix prototypes of X-state-changed and X-config-changed callbacks.
(cherry picked from commit a29286c138b5bf6d041c099237b34ffad24eff12)
panel-plugin/xkb-config.c | 17 ++---
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 3d1a26c..3e76039 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -68,12 +68,14 @@ typedef struct
t_xkb_config *config;
gboolean ignore_xkl_config_change = FALSE;
-voidxkb_config_state_changed(XklEngine *engine,
- XklEngineStateChange
*change,
+static void xkb_config_state_changed(XklEngine *engine,
+ XklEngineStateChange
change,
gint group,
- gboolean restore);
+ gboolean restore,
+ gpointer user_data);
-voidxkb_config_xkl_config_changed (XklEngine *engine);
+static void xkb_config_xkl_config_changed (XklEngine *engine,
+ gpointer user_data);
GdkFilterReturn handle_xevent (GdkXEvent * xev,
GdkEvent * event);
@@ -542,9 +544,10 @@ xkb_config_get_variant (gint group)
void
xkb_config_state_changed (XklEngine *engine,
- XklEngineStateChange *change,
+ XklEngineStateChange change,
gint group,
- gboolean restore)
+ gboolean restore,
+ gpointer user_data)
{
if (change == GROUP_CHANGED)
{
@@ -575,7 +578,7 @@ xkb_config_state_changed (XklEngine *engine,
}
void
-xkb_config_xkl_config_changed (XklEngine *engine)
+xkb_config_xkl_config_changed (XklEngine *engine, gpointer user_data)
{
TRACE (ignore_xkl_config_change: %d , ignore_xkl_config_change);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Fix XKB_DEBUG macros
Updating branch refs/heads/4.10_panel_support
to 213590fc41e272541f057b13a67fb1850877b145 (commit)
from 8e661ce85c9200286e6aa0cc12514e4fb4203b5f (commit)
commit 213590fc41e272541f057b13a67fb1850877b145
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Apr 2 16:47:02 2013 -0400
Fix XKB_DEBUG macros
panel-plugin/xkb-config.h | 28 +++-
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/panel-plugin/xkb-config.h b/panel-plugin/xkb-config.h
index c251e53..c91a734 100644
--- a/panel-plugin/xkb-config.h
+++ b/panel-plugin/xkb-config.h
@@ -91,30 +91,32 @@ gint xkb_config_get_max_layout_number
(void);
#define XKB_DEBUG(...) \
do { g_fprintf (stderr, [[ XFCE XKB PLUGIN ]]: __VA_ARGS__); g_fprintf
(stderr, \n); } while (0)
-#define XKB_DEBUG_KBD(kbd, msg) g_printf(DUMPING KEYBOARD SETTINGS [[[%s]]]
{%d}: , msg, kbd);\
+#define XKB_DEBUG_KBD(kbd, msg) g_printf(DUMPING KEYBOARD SETTINGS [[[%s]]]
{%p}: , msg, kbd);\
if (kbd) { \
g_printf (\n\
- model: %s [%d]\n\
- layouts: %s [%d]\n\
- variants: %s [%d]\n\
- options: %s [%d]\n, \
+ model: %s [%p]\n\
+ layouts: %s [%p]\n\
+ variants: %s [%p]\n\
+ toggle: %s [%p]\n\
+ compose_key: %s [%p]\n, \
kbd-model, kbd-model, \
kbd-layouts, kbd-layouts, \
kbd-variants, kbd-variants, \
-kbd-options, kbd-options); \
+kbd-toggle_option, kbd-toggle_option, \
+kbd-compose_key_position, kbd-compose_key_position); \
} else { \
g_printf(NULL\n); \
}
-#define XKB_DEBUG_CONFIG_REC(crec, msg) g_printf(DUMPING CONFIG REC [[[%s]]]
{%d}: , msg, (int) crec);\
+#define XKB_DEBUG_CONFIG_REC(crec, msg) g_printf(DUMPING CONFIG REC [[[%s]]]
{%p}: , msg, crec);\
if (crec) { \
g_printf (\n\
-model: %s [%d]\n\
-layouts: %s [%d]\n\
-variants: %s [%d]\n, \
-crec-model, (int) crec-model, \
-g_strjoinv (,, crec-layouts), (int) crec-layouts, \
-g_strjoinv (,, crec-variants), (int) crec-variants); \
+model: %s [%p]\n\
+layouts: %s [%p]\n\
+variants: %s [%p]\n, \
+crec-model, crec-model, \
+g_strjoinv (,, crec-layouts), crec-layouts, \
+g_strjoinv (,, crec-variants), crec-variants); \
} else { \
g_printf (NULL\n); \
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Remove unusued function prototype and variable
Updating branch refs/heads/4.10_panel_support
to 892a9c17bd5db8a70034aaf0248f1df49232bc40 (commit)
from 35991f4e1a0507603f11d5b4fea09dae683b8a02 (commit)
commit 892a9c17bd5db8a70034aaf0248f1df49232bc40
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Apr 2 17:03:34 2013 -0400
Remove unusued function prototype and variable
panel-plugin/xkb-config.c |1 -
panel-plugin/xkb-settings-dialog.c |1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 88c7af5..f6ea72e 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -80,7 +80,6 @@ static void xkb_config_xkl_config_changed
(XklEngine *engine,
GdkFilterReturn handle_xevent (GdkXEvent * xev,
GdkEvent * event);
-voidxkb_config_update_configuration (t_xkb_settings
*settings);
static void xkb_config_free ();
static void xkb_config_initialize_xkb_options (t_xkb_settings
*settings);
diff --git a/panel-plugin/xkb-settings-dialog.c
b/panel-plugin/xkb-settings-dialog.c
index 145eebf..a5dc479 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -41,7 +41,6 @@
GtkTreeIter current_iter;
GtkWidget *settings_dialog;
-GtkWidget *default_layout_menu;
enum combo_enum
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Make some variables and functions static
Updating branch refs/heads/4.10_panel_support
to 2eab2516bfee4b6ced8cb02433ff0ecac692e42c (commit)
from 892a9c17bd5db8a70034aaf0248f1df49232bc40 (commit)
commit 2eab2516bfee4b6ced8cb02433ff0ecac692e42c
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Apr 2 17:05:17 2013 -0400
Make some variables and functions static
panel-plugin/xkb-config.c |6 +++---
panel-plugin/xkb-settings-dialog.c |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index f6ea72e..ed73be1 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -65,8 +65,8 @@ typedef struct
XklConfigRec *config_rec;
} t_xkb_config;
-t_xkb_config *config;
-gboolean ignore_xkl_config_change = FALSE;
+static t_xkb_config *config;
+static gboolean ignore_xkl_config_change = FALSE;
static void xkb_config_state_changed(XklEngine *engine,
XklEngineStateChange
change,
@@ -77,7 +77,7 @@ static void xkb_config_state_changed
(XklEngine *engine,
static void xkb_config_xkl_config_changed (XklEngine *engine,
gpointer user_data);
-GdkFilterReturn handle_xevent (GdkXEvent * xev,
+static GdkFilterReturn handle_xevent (GdkXEvent * xev,
GdkEvent * event);
static void xkb_config_free ();
diff --git a/panel-plugin/xkb-settings-dialog.c
b/panel-plugin/xkb-settings-dialog.c
index a5dc479..2f9f8f3 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -39,8 +39,8 @@
#include xkb-settings-dialog.h
#include xkb-util.h
-GtkTreeIter current_iter;
-GtkWidget *settings_dialog;
+static GtkTreeIter current_iter;
+static GtkWidget *settings_dialog;
enum combo_enum
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Handle malformed .rc file more gracefully
Updating branch refs/heads/4.10_panel_support
to 35991f4e1a0507603f11d5b4fea09dae683b8a02 (commit)
from 213590fc41e272541f057b13a67fb1850877b145 (commit)
commit 35991f4e1a0507603f11d5b4fea09dae683b8a02
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Mon Apr 1 17:49:02 2013 -0400
Handle malformed .rc file more gracefully
We will try to load xkl config first and use the current xkl
config for any .rc settings we fail to load.
This should fix the crash when loading the old xkb-plugin
with the .rc file created by the plugin from the git master.
panel-plugin/xfce4-xkb-plugin.c | 34 +++---
panel-plugin/xkb-config.c |2 ++
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index e1c8439..b47269b 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -172,12 +172,7 @@ xkb_new (XfcePanelPlugin *plugin)
xkb-settings = g_new0 (t_xkb_settings, 1);
xkb-plugin = plugin;
-filename = xfce_panel_plugin_lookup_rc_file (plugin);
-if ((!filename) || (!xkb_load_config (xkb, filename)))
-{
-xkb_load_default (xkb);
-}
-g_free (filename);
+xkb_load_default (xkb);
xkb-btn = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (xkb-btn), GTK_RELIEF_NONE);
@@ -214,6 +209,15 @@ xkb_new (XfcePanelPlugin *plugin)
xkb_initialize_menu (xkb);
}
+filename = xfce_panel_plugin_lookup_rc_file (plugin);
+if (xkb_load_config (xkb, filename))
+{
+xkb_config_update_settings (xkb-settings);
+}
+g_free (filename);
+
+
+
wnck_screen = wnck_screen_get_default ();
g_signal_connect (G_OBJECT (wnck_screen), active-window-changed,
G_CALLBACK (xkb_plugin_active_window_changed), xkb);
@@ -294,6 +298,9 @@ static gboolean
xkb_load_config (t_xkb *xkb, const gchar *filename)
{
XfceRc* rcfile;
+
+TRACE (rc filename: %s, filename);
+
if ((rcfile = xfce_rc_simple_open (filename, TRUE)))
{
xfce_rc_set_group (rcfile, NULL);
@@ -309,15 +316,12 @@ xkb_load_config (t_xkb *xkb, const gchar *filename)
xkb-settings-never_modify_config = xfce_rc_read_bool_entry (rcfile,
never_modify_config, FALSE);
-if (xkb-settings-kbd_config == NULL)
-{
-xkb-settings-kbd_config = g_new0 (t_xkb_kbd_config, 1);
-}
-xkb-settings-kbd_config-model = g_strdup (xfce_rc_read_entry
(rcfile, model, NULL));
-xkb-settings-kbd_config-layouts = g_strdup (xfce_rc_read_entry
(rcfile, layouts, NULL));
-xkb-settings-kbd_config-variants = g_strdup (xfce_rc_read_entry
(rcfile, variants, NULL));
-xkb-settings-kbd_config-toggle_option = g_strdup
(xfce_rc_read_entry (rcfile, toggle_option, NULL));
-xkb-settings-kbd_config-compose_key_position = g_strdup
(xfce_rc_read_entry (rcfile, compose_key_position, NULL));
+g_assert (xkb-settings-kbd_config != NULL);
+xkb-settings-kbd_config-model = g_strdup (xfce_rc_read_entry
(rcfile, model, xkb-settings-kbd_config-model));
+xkb-settings-kbd_config-layouts = g_strdup (xfce_rc_read_entry
(rcfile, layouts, xkb-settings-kbd_config-layouts));
+xkb-settings-kbd_config-variants = g_strdup (xfce_rc_read_entry
(rcfile, variants, xkb-settings-kbd_config-variants));
+xkb-settings-kbd_config-toggle_option = g_strdup
(xfce_rc_read_entry (rcfile, toggle_option,
xkb-settings-kbd_config-toggle_option));
+xkb-settings-kbd_config-compose_key_position = g_strdup
(xfce_rc_read_entry (rcfile, compose_key_position,
xkb-settings-kbd_config-compose_key_position));
xfce_rc_close (rcfile);
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 3e76039..88c7af5 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -406,6 +406,8 @@ xkb_config_update_settings (t_xkb_settings *settings)
if (!xkl_config_rec_activate (config-config_rec, config-engine))
{
DBG (ERROR: can't activate xkl config: [%s],
xkl_get_last_error());
+XKB_DEBUG_CONFIG_REC (config-config_rec, activated);
+return FALSE;
// FIXME: we should probably try to reload from xkl config here
}
ignore_xkl_config_change = FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Use a wrapper around xkl_config_rec_activate
Updating branch refs/heads/4.10_panel_support
to d764e65233009d38537012b927699c21982b9789 (commit)
from 2eab2516bfee4b6ced8cb02433ff0ecac692e42c (commit)
commit d764e65233009d38537012b927699c21982b9789
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Apr 2 17:13:04 2013 -0400
Use a wrapper around xkl_config_rec_activate
panel-plugin/xkb-config.c | 32 ++--
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index ed73be1..f2c86df 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -82,6 +82,7 @@ static GdkFilterReturn handle_xevent
(GdkXEvent * xev,
static void xkb_config_free ();
static void xkb_config_initialize_xkb_options (t_xkb_settings
*settings);
+static gboolean xkb_config_activate_xkl_record ();
/* -- implementation - */
@@ -401,15 +402,11 @@ xkb_config_update_settings (t_xkb_settings *settings)
if (activate_settings !settings-never_modify_config)
{
-ignore_xkl_config_change = TRUE;
-if (!xkl_config_rec_activate (config-config_rec, config-engine))
+if (!xkb_config_activate_xkl_record ())
{
-DBG (ERROR: can't activate xkl config: [%s],
xkl_get_last_error());
-XKB_DEBUG_CONFIG_REC (config-config_rec, activated);
-return FALSE;
// FIXME: we should probably try to reload from xkl config here
+return FALSE;
}
-ignore_xkl_config_change = FALSE;
}
xkb_config_initialize_xkb_options (settings);
@@ -651,3 +648,26 @@ xkb_config_get_max_layout_number (void)
return xkl_engine_get_max_num_groups (config-engine);
}
+gboolean
+xkb_config_activate_xkl_record (void)
+{
+gboolean rc;
+
+if (config-config_rec-model == NULL)
+{
+config-config_rec-model = g_strdup ();
+}
+
+XKB_DEBUG_CONFIG_REC (config-config_rec, activate);
+
+ignore_xkl_config_change = TRUE;
+rc = xkl_config_rec_activate (config-config_rec, config-engine);
+ignore_xkl_config_change = FALSE;
+
+if (!rc)
+{
+DBG (ERROR: can't activate xkl config: [%s], xkl_get_last_error());
+}
+
+return rc;
+}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:4.10_panel_support Reset xkb config when new keyboard is detected
Updating branch refs/heads/4.10_panel_support
to 0aab3c44d1f19583fe5d9affa9034c199b772cdc (commit)
from d764e65233009d38537012b927699c21982b9789 (commit)
commit 0aab3c44d1f19583fe5d9affa9034c199b772cdc
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Tue Apr 2 16:31:03 2013 -0400
Reset xkb config when new keyboard is detected
This should help to avoid losing xkb-plugin config.
panel-plugin/xkb-config.c | 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index f2c86df..e34c036 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -76,6 +76,8 @@ static void xkb_config_state_changed
(XklEngine *engine,
static void xkb_config_xkl_config_changed (XklEngine *engine,
gpointer user_data);
+voidxkb_config_reset_xkl_config (XklEngine *engine,
+ gpointer user_data);
static GdkFilterReturn handle_xevent (GdkXEvent * xev,
GdkEvent * event);
@@ -121,6 +123,10 @@ xkb_config_initialize (t_xkb_settings *settings,
X-config-changed,
G_CALLBACK (xkb_config_xkl_config_changed),
NULL);
+g_signal_connect (config-engine,
+X-new-device,
+G_CALLBACK (xkb_config_reset_xkl_config),
+NULL);
gdk_window_add_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
return TRUE;
@@ -593,6 +599,15 @@ xkb_config_xkl_config_changed (XklEngine *engine, gpointer
user_data)
}
}
+void
+xkb_config_reset_xkl_config (XklEngine *engine,
+ gpointer user_data)
+{
+TRACE (X-new-device: %d, config-settings-never_modify_config);
+if (!config-settings-never_modify_config)
+xkb_config_activate_xkl_record ();
+}
+
gint
xkb_config_variant_index_for_group (gint group)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:andrzejr/tmp3 indicator-button: minor fix to gtk_menu_popup call
Updating branch refs/heads/andrzejr/tmp3 to 985d34925075ffd8ea020cec1fd2e849d47aff83 (commit) from 23dfad6c95ba2502b2c5d6b0c26722c3e09ff59e (commit) commit 985d34925075ffd8ea020cec1fd2e849d47aff83 Author: Andrzej ndrwr...@gmail.com Date: Tue Apr 2 20:17:03 2013 +0100 indicator-button: minor fix to gtk_menu_popup call Getting time from the event structure rather than from gtk_get_current_event_time(). It does not solve menu flicker issues present in some indicators (appmenu, qt-sni etc), though. They seem to originate from the indicator itself. panel-plugin/indicator-button.c |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c index 8b269a6..74ed022 100644 --- a/panel-plugin/indicator-button.c +++ b/panel-plugin/indicator-button.c @@ -579,9 +579,8 @@ xfce_indicator_button_button_press (GtkWidget *widget, gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE); gtk_menu_reposition (GTK_MENU (button-menu)); gtk_menu_popup (button-menu, NULL, NULL, - xfce_panel_plugin_position_menu, - button-plugin, - 1, gtk_get_current_event_time ()); + xfce_panel_plugin_position_menu, button-plugin, + event-button, event-time); return TRUE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:andrzejr/tmp3 Fixed #9040.
Updating branch refs/heads/andrzejr/tmp3
to f60f6d59702faef79cb3c346002395cbd0696c86 (commit)
from 985d34925075ffd8ea020cec1fd2e849d47aff83 (commit)
commit f60f6d59702faef79cb3c346002395cbd0696c86
Author: Andrzej ndrwr...@gmail.com
Date: Wed Apr 3 01:46:26 2013 +0100
Fixed #9040.
This required getting replacing XfcePanelImage with GtkImage. The former
does not work reliably with non-square icons and added automatization
is not needed in this case.
Only horizontal non-square icons are supported (vertical will be squeezed
into a square shape). Non-square icons are rendered in a single row
(like indicators with labels).
panel-plugin/indicator-box.c| 16 +
panel-plugin/indicator-button.c | 63 ++
panel-plugin/indicator-button.h |2 +
3 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index 4c9ae90..c181009 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -336,7 +336,7 @@ xfce_indicator_box_size_request (GtkWidget *widget,
gint row;
gint nrows;
gint x;
- gboolean has_label;
+ gboolean has_label, rectangular_icon;
GtkOrientation panel_orientation;
panel_size = indicator_config_get_panel_size (box-config);
@@ -359,9 +359,10 @@ xfce_indicator_box_size_request (GtkWidget *widget,
gtk_widget_size_request (GTK_WIDGET (button), child_req);
has_label = (xfce_indicator_button_get_label (button) != NULL);
+ rectangular_icon = xfce_indicator_button_is_icon_rectangular
(button);
/* wrap rows if column is overflowing or a label is encountered */
- if (row 0 (has_label || row = nrows))
+ if (row 0 (has_label || row = nrows || rectangular_icon))
{
x += length;
row = 0;
@@ -371,7 +372,7 @@ xfce_indicator_box_size_request (GtkWidget *widget,
length =
MAX (length, (panel_orientation == GTK_ORIENTATION_HORIZONTAL) ?
child_req.width :child_req.height);
- if (has_label || row = nrows)
+ if (has_label || row = nrows || rectangular_icon)
{
x += length;
row = 0;
@@ -416,7 +417,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
gint length, width;
gint row;
gint nrows;
- gboolean has_label;
+ gboolean has_label, rectangular_icon;
GtkOrientation panel_orientation;
row = 0;
@@ -445,9 +446,10 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
gtk_widget_get_child_requisition (GTK_WIDGET (button), child_req);
has_label = (xfce_indicator_button_get_label (button) != NULL);
+ rectangular_icon = xfce_indicator_button_is_icon_rectangular
(button);
/* wrap rows if column is overflowing or a label is encountered */
- if (row 0 (has_label || row = nrows))
+ if (row 0 (has_label || row = nrows || rectangular_icon))
{
x += length;
y = 0;
@@ -455,7 +457,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
length = 0;
}
- width = (has_label) ? panel_size : size;
+ width = (has_label || rectangular_icon) ? panel_size : size;
length = MAX (length,
(panel_orientation == GTK_ORIENTATION_HORIZONTAL) ?
child_req.width :child_req.height);
@@ -479,7 +481,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
gtk_widget_size_allocate (GTK_WIDGET (button), child_alloc);
- if (has_label || row = nrows)
+ if (has_label || row = nrows || rectangular_icon)
{
x += length;
y = 0;
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 74ed022..25a3572 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -67,6 +67,7 @@ struct _XfceIndicatorButton
GtkWidget*label;
GtkWidget*icon;
GtkWidget*orig_icon;
+ gboolean rectangular_icon;
gulongorig_icon_changed_id;
gulongconfiguration_changed_id;
@@ -119,6 +120,7 @@ xfce_indicator_button_init (XfceIndicatorButton *button)
button-icon = NULL;
button-orig_icon_changed_id = 0;
button-configuration_changed_id = 0;
+ button-rectangular_icon = FALSE;
button-align_box = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (button), button-align_box);
@@ -214,8 +216,6 @@ xfce_indicator_button_update_layout (XfceIndicatorButton
*button)
gtk_label_set_angle (GTK_LABEL (button-label),
