[Xfce4-commits] Creating annotated tag 0.5.4.3
Updating annotated tag refs/tags/0.5.4.3 as new annotated tag to 3954fa9ee56a178ea6399ab7646893e547038ed2 (tag) succeeds 0.5.4.2-25-gc158d3f tagged by Azamat H. Hackimov on 2012-01-06 23:25 +0100 Azamat H. Hackimov (1): Fix error with incorrect handling variants (bug #8255 by Ivan Romanov) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix error with incorrect handling variants (bug #8255 by Ivan Romanov)
Updating branch refs/heads/master
to f80ece9da08f15efd5d1e5f2c78e400664707ed6 (commit)
from c158d3f5514e4f7ca1c69f76f3abeb3bd05a6ee8 (commit)
commit f80ece9da08f15efd5d1e5f2c78e400664707ed6
Author: Azamat H. Hackimov
Date: Sat Jan 7 04:23:56 2012 +0600
Fix error with incorrect handling variants (bug #8255 by Ivan Romanov)
ChangeLog |6 +-
configure.in.in |2 +-
panel-plugin/xkb-config.c | 21 -
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6bc3971..d7b5e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2012-01-07 04:18 winterheart
+ * New version 0.5.4.3
+ * Fix error with incorrect handling variants (bug #8255 by Ivan Romanov)
+
2011-11-04 20:42 winterheart
- * Text size on icon is noew adjustable (bug #6703 by Rinat)
+ * Text size on icon is now adjustable (bug #6703 by Rinat)
* New flag: Cambodia (request from Janne Snabb)
2011-10-15 18:54 winterheart
diff --git a/configure.in.in b/configure.in.in
index 0dfebd2..35d88e9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -19,7 +19,7 @@ m4_define([xkb_version],
[xkb_version_major().xkb_version_minor().xkb_version_mi
dnl ***
dnl *** Initialize autoconf ***
dnl ***
-AC_COPYRIGHT([Copyright (c) 2006-2011
+AC_COPYRIGHT([Copyright (c) 2006-2012
The Xfce development team. All rights reserved.])
AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/],
[xfce4-xkb-plugin])
AC_PREREQ([2.50])
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 22f771d..2c5af77 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -314,8 +314,27 @@ xkb_config_update_settings (t_xkb_settings *settings)
settings->kbd_config->model = g_strdup (config->config_rec->model);
g_free (settings->kbd_config->layouts);
settings->kbd_config->layouts = g_strjoinv (",",
config->config_rec->layouts);
+
+/* XklConfigRec uses for NULL for empty variant instead of "".
+ * So if has skipped variants we can't get proper
settings->kbd_config->variants.
+ * So I use this hack to get proper kbd_config->variants */
+gchar *tmp1 = g_strdup("");
+gchar *tmp2 = NULL;
+int i;
+for (i = 0; config->config_rec->layouts[i]; i++)
+{
+tmp2 = g_strconcat (tmp1, config->config_rec->variants[i] ?
config->config_rec->variants[i] : "", NULL);
+g_free(tmp1);
+tmp1 = tmp2;
+if (config->config_rec->layouts[i + 1])
+{
+tmp2 = g_strconcat (tmp1, ",", NULL);
+g_free(tmp1);
+tmp1 = tmp2;
+}
+}
g_free (settings->kbd_config->variants);
-settings->kbd_config->variants = g_strjoinv (",",
config->config_rec->variants);
+settings->kbd_config->variants = tmp2;
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Text size on icon is noew adjustable (bug #6703 by Rinat) 3 modes is now available in options: small, medium, large.
Updating branch refs/heads/master
to c4b5d2746aefd562f324a12fa789423d22ff4324 (commit)
from 8f25a9eeeb812f49ed5ab030549f6d3763756c0b (commit)
commit c4b5d2746aefd562f324a12fa789423d22ff4324
Author: Azamat H. Hackimov
Date: Fri Nov 4 21:56:19 2011 +0600
Text size on icon is noew adjustable (bug #6703 by Rinat)
3 modes is now available in options: small, medium, large.
ChangeLog |1 +
panel-plugin/xfce4-xkb-plugin.c|3 +++
panel-plugin/xfce4-xkb-plugin.h|8
panel-plugin/xkb-cairo.c | 34 --
panel-plugin/xkb-cairo.h |1 +
panel-plugin/xkb-callbacks.c |1 +
panel-plugin/xkb-settings-dialog.c | 23 ++-
7 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 404b7d9..6bc3971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
2011-11-04 20:42 winterheart
+ * Text size on icon is noew adjustable (bug #6703 by Rinat)
* New flag: Cambodia (request from Janne Snabb)
2011-10-15 18:54 winterheart
diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index c8ccae8..6a0635a 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -261,6 +261,7 @@ xfce_xkb_save_config (XfcePanelPlugin *plugin, t_xkb *xkb)
xfce_rc_set_group (rcfile, NULL);
xfce_rc_write_int_entry (rcfile, "display_type", xkb->display_type);
+xfce_rc_write_int_entry (rcfile, "display_textsize",
xkb->display_textsize);
xfce_rc_write_int_entry (rcfile, "group_policy",
xkb->settings->group_policy);
xfce_rc_write_int_entry (rcfile, "default_group",
xkb->settings->default_group);
xfce_rc_write_bool_entry (rcfile, "never_modify_config",
xkb->settings->never_modify_config);
@@ -293,6 +294,7 @@ xkb_load_config (t_xkb *xkb, const gchar *filename)
xfce_rc_set_group (rcfile, NULL);
xkb->display_type = xfce_rc_read_int_entry (rcfile, "display_type",
DISPLAY_TYPE_IMAGE);
+xkb->display_textsize = xfce_rc_read_int_entry (rcfile,
"display_textsize", DISPLAY_TEXTSIZE_SMALL);
xkb->settings->group_policy = xfce_rc_read_int_entry (rcfile,
"group_policy", GROUP_POLICY_PER_APPLICATION);
if (xkb->settings->group_policy != GROUP_POLICY_GLOBAL)
@@ -324,6 +326,7 @@ static void
xkb_load_default (t_xkb *xkb)
{
xkb->display_type = DISPLAY_TYPE_IMAGE;
+xkb->display_textsize = DISPLAY_TEXTSIZE_SMALL;
xkb->settings->group_policy = GROUP_POLICY_PER_APPLICATION;
xkb->settings->default_group = 0;
xkb->settings->kbd_config = NULL;
diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index 12aed1f..ef9b995 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -42,6 +42,13 @@ typedef enum
DISPLAY_TYPE_TEXT = 1
} t_display_type;
+typedef enum
+{
+DISPLAY_TEXTSIZE_SMALL = 0,
+DISPLAY_TEXTSIZE_MEDIUM = 1,
+DISPLAY_TEXTSIZE_LARGE = 2
+} t_display_textsize;
+
typedef struct
{
XfcePanelPlugin *plugin;
@@ -53,6 +60,7 @@ typedef struct
gint button_vsize;/* read allocated button size - see below */
t_display_type display_type; /* display layout as image ot text */
+t_display_textsize display_textsize; /* text size for text layout */
t_xkb_settings *settings; /* per-app setting and default group */
gint button_state;/* gtk state of the button */
diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index eeb18ac..3b828ec 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -25,6 +25,7 @@
#include "xkb-cairo.h"
#include "xkb-util.h"
+#include "xfce4-xkb-plugin.h"
#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold %d"
@@ -44,23 +45,6 @@
cairo_device_to_user (cr, &xx, &yy); \
cairo_move_to (cr, xx, yy);
-gint font_sizes[113] = {
-6,6,6,6,6,6,6,6,
-7,7,8,8,8,8,8,8,
-10, 10, 10, 10, 12, 12, 14, 14,
-14, 14, 14, 14, 16, 16, 16, 16,
-18, 18, 18, 18, 20, 20, 20, 20,
-20, 20, 22, 22, 22, 22, 24, 24,
-24, 24, 26, 26, 26, 26, 28, 28,
-28, 28, 30, 30, 30, 30, 30, 30,
-32, 32, 32, 32, 34, 34, 34, 34,
-34, 34, 36, 36, 36, 36, 36, 36,
-
[Xfce4-commits] Migration to auto-po.
Updating branch refs/heads/master
to 8f25a9eeeb812f49ed5ab030549f6d3763756c0b (commit)
from 9a71c2800a73426158a7cbea7a8dccbb20b24bc2 (commit)
commit 8f25a9eeeb812f49ed5ab030549f6d3763756c0b
Author: Azamat H. Hackimov
Date: Fri Nov 4 21:51:39 2011 +0600
Migration to auto-po.
autogen.sh | 18 +-
configure.in.in |2 +-
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 5a8fa1e..351d7d6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,20 +13,4 @@ EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 < "configure.in"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 87517b2..0dfebd2 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,7 +13,7 @@ dnl ***
m4_define([xkb_version_major], [0])
m4_define([xkb_version_minor], [5])
m4_define([xkb_version_micro], [4])
-m4_define([xkb_version_nano], [2])
+m4_define([xkb_version_nano], [3])
m4_define([xkb_version],
[xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(),
[], [], .[xkb_version_nano()])])
dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] New flag: Cambodia (request from Janne Snabb)
Updating branch refs/heads/master to 9a71c2800a73426158a7cbea7a8dccbb20b24bc2 (commit) from 792818a367fedd32a3896bcc6268edb800f06c17 (commit) commit 9a71c2800a73426158a7cbea7a8dccbb20b24bc2 Author: Azamat H. Hackimov Date: Fri Nov 4 20:47:42 2011 +0600 New flag: Cambodia (request from Janne Snabb) ChangeLog |3 + flags/Makefile.am |1 + flags/kh.svg | 126 + 3 files changed, 130 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c7ae47..404b7d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2011-11-04 20:42 winterheart + * New flag: Cambodia (request from Janne Snabb) + 2011-10-15 18:54 winterheart * New version 0.5.4.2 * Removing LINGUAS file (#8034) diff --git a/flags/Makefile.am b/flags/Makefile.am index ba52b7e..b48d931 100644 --- a/flags/Makefile.am +++ b/flags/Makefile.am @@ -43,6 +43,7 @@ flags_DATA = ae.svg \ it.svg \ jo.svg \ jp.svg \ + kh.svg \ km.svg \ kp.svg \ kr.svg \ diff --git a/flags/kh.svg b/flags/kh.svg new file mode 100644 index 000..0bb750d --- /dev/null +++ b/flags/kh.svg @@ -0,0 +1,126 @@ + +http://www.w3.org/2000/svg"; width="1800" height="1200"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.4.2
Updating annotated tag refs/tags/0.5.4.2 as new annotated tag to b3221b02bf12e4f357b445de2c3e5022a5fe83f9 (tag) succeeds 0.5.4.1-26-g60b087b tagged by Azamat H. Hackimov on 2011-10-15 15:31 +0200 Azamat H. Hackimov (1): New version 0.5.4.2 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] New version 0.5.4.2
Updating branch refs/heads/master to e0802c5be2c3d448a8ea7969bb0fdfe408f6a21c (commit) from 60b087baa7711b7cf375a53b7c258d1ad1295120 (commit) commit e0802c5be2c3d448a8ea7969bb0fdfe408f6a21c Author: Azamat H. Hackimov Date: Sat Oct 15 19:04:11 2011 +0600 New version 0.5.4.2 ChangeLog |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96ded74..4c7ae47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-15 18:54 winterheart + * New version 0.5.4.2 + * Removing LINGUAS file (#8034) + * Translations update + 2011-07-02 19:23 winterheart * Bosnian flag renamed from bs to ba (#7744) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Removing LINGUAS file (#8034)
Updating branch refs/heads/master to 60b087baa7711b7cf375a53b7c258d1ad1295120 (commit) from 3c7d959f77d9678290798cdae34719ceedb74f99 (commit) commit 60b087baa7711b7cf375a53b7c258d1ad1295120 Author: Azamat H. Hackimov Date: Sat Oct 15 19:03:07 2011 +0600 Removing LINGUAS file (#8034) po/LINGUAS |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 3412071..000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ar ast be bg ca cs da de el en_GB es eu fr gl hu id it ja lv pl pt_BR pt ro ru sv tr uk ur ur_PK zh_CN zh_TW ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gitignore
Updating branch refs/heads/master to 3c7d959f77d9678290798cdae34719ceedb74f99 (commit) from f5a1e3b9a894b23f2d3e672e07bf8e561b2f714a (commit) commit 3c7d959f77d9678290798cdae34719ceedb74f99 Author: Azamat H. Hackimov Date: Sat Oct 15 19:02:22 2011 +0600 gitignore .gitignore |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0481f6b..eb0ea70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +autom4te.cache Makefile +Makefile.in po/*.gmo .deps *.o *.tar.* config.* configure* +m4/*.m4 +*.m4 +*.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Include empty catalog m4
Updating branch refs/heads/master to f5a1e3b9a894b23f2d3e672e07bf8e561b2f714a (commit) from 3855eb105600714cd5d096b26620f11ce64db58c (commit) commit f5a1e3b9a894b23f2d3e672e07bf8e561b2f714a Author: Azamat H. Hackimov Date: Sat Oct 15 18:58:24 2011 +0600 Include empty catalog m4 NEWS => m4/.touch |0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/NEWS b/m4/.touch similarity index 100% copy from NEWS copy to m4/.touch ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bosnian flag renamed from bs to ba (#7744)
Updating branch refs/heads/master
to ecc1ba408119a874a1b1aa535075f670758cbd4b (commit)
from 31b6c638207521e0e5e1e9f6f667b95dbb81e373 (commit)
commit ecc1ba408119a874a1b1aa535075f670758cbd4b
Author: Azamat H. Hackimov
Date: Sat Jul 2 19:25:09 2011 +0600
Bosnian flag renamed from bs to ba (#7744)
ChangeLog|3 +++
configure.in.in |2 +-
flags/Makefile.am|2 +-
flags/{bs.svg => ba.svg} |0
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6c8825a..96ded74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-07-02 19:23 winterheart
+ * Bosnian flag renamed from bs to ba (#7744)
+
2011-05-23 00:34 winterheart
* New version 0.5.4.1
* New translation strings (#7516, Jérôme Guelfucci)
diff --git a/configure.in.in b/configure.in.in
index 4643a2f..87517b2 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,7 +13,7 @@ dnl ***
m4_define([xkb_version_major], [0])
m4_define([xkb_version_minor], [5])
m4_define([xkb_version_micro], [4])
-m4_define([xkb_version_nano], [1])
+m4_define([xkb_version_nano], [2])
m4_define([xkb_version],
[xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(),
[], [], .[xkb_version_nano()])])
dnl ***
diff --git a/flags/Makefile.am b/flags/Makefile.am
index 651abbf..ba52b7e 100644
--- a/flags/Makefile.am
+++ b/flags/Makefile.am
@@ -6,12 +6,12 @@ flags_DATA = ae.svg \
ar.svg \
at.svg \
az.svg \
+ ba.svg \
ben.svg \
be.svg \
bg.svg \
bh.svg \
br.svg \
- bs.svg \
by.svg \
ca.svg \
ch.svg \
diff --git a/flags/bs.svg b/flags/ba.svg
similarity index 100%
rename from flags/bs.svg
rename to flags/ba.svg
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
New version for release: * New version 0.5.4.1 * New translation strings (#7516, Jérôme Guelfucci) * Code cleanup (Jérôme Guelfucci) * Fixing
Updating branch refs/heads/master to 716a099507119e44eaffe9e537870df05fe39814 (commit) from b5a688259a6ed6deaf46d60babcdf2797ff7be64 (commit) commit 716a099507119e44eaffe9e537870df05fe39814 Author: Azamat H. Hackimov Date: Mon May 23 01:06:20 2011 +0600 New version for release: * New version 0.5.4.1 * New translation strings (#7516, Jérôme Guelfucci) * Code cleanup (Jérôme Guelfucci) * Fixing memory leaks (#7363, Jérôme Guelfucci) * Scrolling the plugin button cycle through layouts (#6533, Jérôme Guelfucci) ChangeLog |8 configure.in.in |4 +++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfe2385..6c8825a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-23 00:34 winterheart + * New version 0.5.4.1 + * New translation strings (#7516, Jérôme Guelfucci) + * Code cleanup (Jérôme Guelfucci) + * Fixing memory leaks (#7363, Jérôme Guelfucci) + * Scrolling the plugin button cycle through layouts (#6533, Jérôme + Guelfucci) + 2011-04-18 00:59 winterheart * panel-plugin/xkb-settings-dialog.c: Remove unnedeed g_strdup as diff --git a/configure.in.in b/configure.in.in index 2c81e8e..4643a2f 100644 --- a/configure.in.in +++ b/configure.in.in @@ -5,13 +5,15 @@ dnl dnl 2003 Benedikt Meurer dnl +AC_CONFIG_MACRO_DIR([m4]) + dnl *** dnl *** Version information *** dnl *** m4_define([xkb_version_major], [0]) m4_define([xkb_version_minor], [5]) m4_define([xkb_version_micro], [4]) -m4_define([xkb_version_nano], [0]) +m4_define([xkb_version_nano], [1]) m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(), [], [], .[xkb_version_nano()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] .gitignore
Updating branch refs/heads/master to b5a688259a6ed6deaf46d60babcdf2797ff7be64 (commit) from dcc38ff61a3a1a575c4deb86321bd588d31f5c1e (commit) commit b5a688259a6ed6deaf46d60babcdf2797ff7be64 Author: Azamat H. Hackimov Date: Mon May 23 01:05:28 2011 +0600 .gitignore .gitignore |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index eb3194e..0481f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ Makefile po/*.gmo .deps *.o +*.tar.* +config.* +configure* ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.4.1
Updating annotated tag refs/tags/0.5.4.1 as new annotated tag to acee0f4fdcb7a4399a703f172aec26d6d6924149 (tag) succeeds 0.5.4.0-60-gb5a6882 tagged by Azamat H. Hackimov on 2011-05-22 21:09 +0200 Azamat H. Hackimov (1): New version for release: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.4.0
Updating annotated tag refs/tags/0.5.4.0 as new annotated tag to 5d10b8d582ea2f94aad14168e8bde39604dac0d5 (tag) succeeds 0.5.3.3-55-g5605910 tagged by Azamat H. Hackimov on 2011-04-17 19:32 + Azamat H. Hackimov (1): Notes to Changelog refreshing pot-files. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Notes to Changelog refreshing pot-files. Ready to release.
Updating branch refs/heads/master to 56bf693704993db9ef9e26813f7167315b53b04a (commit) from 5605910b37f6ea59bb7023b84088be343eb951a2 (commit) commit 56bf693704993db9ef9e26813f7167315b53b04a Author: Azamat H. Hackimov Date: Mon Apr 18 01:09:45 2011 +0600 Notes to Changelog refreshing pot-files. Ready to release. ChangeLog |7 +++ po/xfce4-xkb-plugin.pot | 37 +++-- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4053fa..dfe2385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ +2011-04-18 00:59 winterheart + + * panel-plugin/xkb-settings-dialog.c: Remove unnedeed g_strdup as + g_strconcat already allocates memory. + * po/be.po, po/id.po: Translation updates. + 2011-02-19 04:06 winterheart + * configure.in.in, panel-plugin/Makefile.am, panel-plugin/xfce4-xkb-plugin.h panel-plugin/xkb-settings-dialog.c: New version 0.5.4, switch to libxfce4ui, updated dependencies. Based diff --git a/po/xfce4-xkb-plugin.pot b/po/xfce4-xkb-plugin.pot index fb47221..db756b0 100644 --- a/po/xfce4-xkb-plugin.pot +++ b/po/xfce4-xkb-plugin.pot @@ -8,15 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-28 20:43+0200\n" +"POT-Creation-Date: 2011-04-18 01:06+0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../panel-plugin/xkb-settings-dialog.c:408 +#: ../panel-plugin/xkb-settings-dialog.c:435 msgid "" "XKB configuration modifications are\n" "disabled from the config file.\n" @@ -24,72 +25,72 @@ msgid "" "See the README file for more information." msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:434 +#: ../panel-plugin/xkb-settings-dialog.c:461 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1 msgid "Keyboard Layouts" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:456 +#: ../panel-plugin/xkb-settings-dialog.c:483 msgid "Keyboard model:" msgstr "" #. toggle layout option -#: ../panel-plugin/xkb-settings-dialog.c:481 +#: ../panel-plugin/xkb-settings-dialog.c:508 msgid "Change layout option:" msgstr "" #. compose key position option -#: ../panel-plugin/xkb-settings-dialog.c:506 +#: ../panel-plugin/xkb-settings-dialog.c:534 msgid "Compose key position:" msgstr "" #. the actual layouts -#: ../panel-plugin/xkb-settings-dialog.c:533 +#: ../panel-plugin/xkb-settings-dialog.c:561 msgid "Keyboard layouts:" msgstr "" #. *** -#: ../panel-plugin/xkb-settings-dialog.c:605 +#: ../panel-plugin/xkb-settings-dialog.c:633 msgid "Show layout as:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:610 +#: ../panel-plugin/xkb-settings-dialog.c:638 msgid "image" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:611 +#: ../panel-plugin/xkb-settings-dialog.c:639 msgid "text" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:615 +#: ../panel-plugin/xkb-settings-dialog.c:643 msgid "Manage layout:" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:620 +#: ../panel-plugin/xkb-settings-dialog.c:648 msgid "globally" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:621 +#: ../panel-plugin/xkb-settings-dialog.c:649 msgid "per window" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:622 +#: ../panel-plugin/xkb-settings-dialog.c:650 msgid "per application" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:661 +#: ../panel-plugin/xkb-settings-dialog.c:689 msgid "Keyboard Layouts Plugin" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:667 +#: ../panel-plugin/xkb-settings-dialog.c:695 msgid "Allows you to configure and use multiple keyboard layouts." msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:671 +#: ../panel-plugin/xkb-settings-dialog.c:699 msgid "Other plugins available here" msgstr "" -#: ../panel-plugin/xkb-settings-dialog.c:720 +#: ../panel-plugin/xkb-settings-dialog.c:748 msgid "Add layout" msgstr "" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] module.xml and gitignore
Updating branch refs/heads/master to 5605910b37f6ea59bb7023b84088be343eb951a2 (commit) from 192b3c3016c1690c4bd266d67a106e0bc8be9fcb (commit) commit 5605910b37f6ea59bb7023b84088be343eb951a2 Author: Azamat H. Hackimov Date: Mon Apr 18 00:51:27 2011 +0600 module.xml and gitignore .gitignore |4 module.xml | 14 ++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..eb3194e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +Makefile +po/*.gmo +.deps +*.o diff --git a/module.xml b/module.xml new file mode 100644 index 000..4eba64f --- /dev/null +++ b/module.xml @@ -0,0 +1,14 @@ + + xfce4-clipman-plugin + XKB layout switching panel plug-in for the Xfce desktop environment + http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"/> + http://foo-projects.org/mailman/listinfo/xfce"/> + + + Azamat H. Hackimov + mailto:azamat.hacki...@gmail.com + winterheart + + + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove unnedeed g_strdup as g_strconcat already allocates memory. Pointed by Lionel Le Folgoc (#7363)
Updating branch refs/heads/master to 192b3c3016c1690c4bd266d67a106e0bc8be9fcb (commit) from 48a3dbe0b418331a85939d3b25b95c150b2ecaef (commit) commit 192b3c3016c1690c4bd266d67a106e0bc8be9fcb Author: Azamat H. Hackimov Date: Mon Apr 18 00:25:44 2011 +0600 Remove unnedeed g_strdup as g_strconcat already allocates memory. Pointed by Lionel Le Folgoc (#7363) panel-plugin/xkb-settings-dialog.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c index d8431a3..6c06612 100644 --- a/panel-plugin/xkb-settings-dialog.c +++ b/panel-plugin/xkb-settings-dialog.c @@ -875,11 +875,11 @@ xkb_settings_update_from_ui (t_xkb *xkb) if (is_default) xkb->settings->default_group = i; i++; -kbd_config->layouts = g_strdup(g_strconcat(kbd_config->layouts, ",", layouts, NULL)); +kbd_config->layouts = g_strconcat(kbd_config->layouts, ",", layouts, NULL); if (variants != NULL) -kbd_config->variants = g_strdup(g_strconcat(kbd_config->variants, ",", variants, NULL)); +kbd_config->variants = g_strconcat(kbd_config->variants, ",", variants, NULL); else -kbd_config->variants = g_strdup(g_strconcat(kbd_config->variants, ",", NULL)); +kbd_config->variants = g_strconcat(kbd_config->variants, ",", NULL); } xkb_config_update_settings (xkb->settings); xkb_refresh_gui (xkb); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix bug #6477, that appears only on empty checkboxes. Thank Lionel Le Folgoc for proposed patch.
Updating branch refs/heads/master
to 9b71c8e7e750f2b1fa1df038e54eff1fddf76262 (commit)
from 31c9c221eee4ad8b3e97f4203c1e39c131924d86 (commit)
commit 9b71c8e7e750f2b1fa1df038e54eff1fddf76262
Author: Azamat H. Hackimov
Date: Sat Feb 26 05:33:54 2011 +0500
Fix bug #6477, that appears only on empty checkboxes.
Thank Lionel Le Folgoc for proposed patch.
panel-plugin/xkb-settings-dialog.c |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/xkb-settings-dialog.c
b/panel-plugin/xkb-settings-dialog.c
index da1ddba..d8431a3 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
gint i = 0;
model = GTK_TREE_MODEL (xkb->combo_store);
-gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo),
&iter);
-gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-kbd_config->model = kbdmodel;
+if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo),
&iter))
+{
+gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
+kbd_config->model = kbdmodel;
+}
model = GTK_TREE_MODEL (xkb->toggle_options_store);
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX
(xkb->toggle_options_combo), &iter))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Switch to libxfce4ui, updated dependencies. Based on patch taken from Gentoo Portage tree (xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch)
Updating branch refs/heads/master to 5a5072f3779a6f55580c0c390690f2662f14e3a3 (commit) from f68ba578500ee4783c5a69ced4ac9c3c94684f24 (commit) commit 5a5072f3779a6f55580c0c390690f2662f14e3a3 Author: Azamat H. Hackimov Date: Sat Feb 19 04:08:14 2011 +0500 Switch to libxfce4ui, updated dependencies. Based on patch taken from Gentoo Portage tree (xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch) configure.in.in| 14 +++--- panel-plugin/Makefile.am |4 ++-- panel-plugin/xfce4-xkb-plugin.h|2 +- panel-plugin/xkb-settings-dialog.c | 30 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.in.in b/configure.in.in index b02bdb2..b2c632a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,14 +10,14 @@ dnl *** Version information *** dnl *** m4_define([xkb_version_major], [0]) m4_define([xkb_version_minor], [5]) -m4_define([xkb_version_micro], [3]) -m4_define([xkb_version_nano], [3]) +m4_define([xkb_version_micro], [4]) +m4_define([xkb_version_nano], [0]) m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_nano(), [], [], .[xkb_version_nano()])]) dnl *** dnl *** Initialize autoconf *** dnl *** -AC_COPYRIGHT([Copyright (c) 2006-2007 +AC_COPYRIGHT([Copyright (c) 2006-2011 The Xfce development team. All rights reserved.]) AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin]) AC_PREREQ([2.50]) @@ -62,10 +62,10 @@ dnl *** dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) -XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [3.2]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfce4ui-1], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.0]) XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 730e20c..5a14fa3 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -23,7 +23,7 @@ xfce4_xkb_plugin_SOURCES = \ xfce4_xkb_plugin_CFLAGS = \ @LIBXFCE4PANEL_CFLAGS@ \ @GTK_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @@LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ @LIBXKLAVIER_CFLAGS@ \ @LIBRSVG_CFLAGS@ \ @@ -36,7 +36,7 @@ xfce4_xkb_plugin_CFLAGS = \ xfce4_xkb_plugin_LDADD = \ @LIBXFCE4PANEL_LIBS@ \ @GTK_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @@LIBXFCE4UI_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ @LIBXKLAVIER_LIBS@ \ @LIBWNCK_LIBS@ \ diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h index c99ebee..ddbaa46 100644 --- a/panel-plugin/xfce4-xkb-plugin.h +++ b/panel-plugin/xfce4-xkb-plugin.h @@ -29,7 +29,7 @@ #include "xkb-config.h" #include -#include +#include #include #include diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c index 178ec5f..da1ddba 100644 --- a/panel-plugin/xkb-settings-dialog.c +++ b/panel-plugin/xkb-settings-dialog.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include "xfce4-xkb-plugin.h" #include "xfce4-xkb-plugin-private.h" @@ -447,7 +447,7 @@ xfce_xkb_configure (XfcePanelPlugin *plugin,
[Xfce4-commits] Authors update.
Updating branch refs/heads/master to 516096c8d8fcee5c91c474a5c1c48bc763f8103e (commit) from d7b495c86d330709b230f50de9c579d3d7bfc1a5 (commit) commit 516096c8d8fcee5c91c474a5c1c48bc763f8103e Author: Azamat H. Hackimov Date: Fri Feb 25 22:33:23 2011 +0500 Authors update. AUTHORS |1 + INSTALL | 200 +++--- README |6 +- 3 files changed, 168 insertions(+), 39 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0ddcbce..57f793b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,4 @@ Benedikt Meurer Alexander Iliev Gauvain Pocentek +Azamat H. Hackimov diff --git a/INSTALL b/INSTALL index d3c5b40..7d1c323 100644 --- a/INSTALL +++ b/INSTALL @@ -2,18 +2,24 @@ Installation Instructions * Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation == -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ The simplest way to compile this package is: 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,15 +83,22 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options = -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent env
[Xfce4-commits] Added missed headers
Updating branch refs/heads/master to 31c9c221eee4ad8b3e97f4203c1e39c131924d86 (commit) from 516096c8d8fcee5c91c474a5c1c48bc763f8103e (commit) commit 31c9c221eee4ad8b3e97f4203c1e39c131924d86 Author: Azamat H. Hackimov Date: Sat Feb 26 02:25:20 2011 +0500 Added missed headers panel-plugin/xkb-cairo.c |6 -- panel-plugin/xkb-cairo.h |4 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c index 5595a9d..8f5633f 100644 --- a/panel-plugin/xkb-cairo.c +++ b/panel-plugin/xkb-cairo.c @@ -23,12 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include -#include - #include "xkb-cairo.h" #include "xkb-util.h" diff --git a/panel-plugin/xkb-cairo.h b/panel-plugin/xkb-cairo.h index 7272ee6..6103a05 100644 --- a/panel-plugin/xkb-cairo.h +++ b/panel-plugin/xkb-cairo.h @@ -27,8 +27,12 @@ #define _XKB_CAIRO_H_ #include +#include #include #include +#include +#include +#include voidxkb_cairo_draw_flag (cairo_t *cr, gchar *flag_name, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] git command for revision
Updating branch refs/heads/master
to d7b495c86d330709b230f50de9c579d3d7bfc1a5 (commit)
from 7852c713532032ba4f5b79fc31f932b154b72020 (commit)
commit d7b495c86d330709b230f50de9c579d3d7bfc1a5
Author: Azamat H. Hackimov
Date: Fri Feb 25 22:31:15 2011 +0500
git command for revision
autogen.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 8acfd34..5a8fa1e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ EOF
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C git rev-parse HEAD`
+revision=`git rev-parse HEAD`
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.in.in" > "configure.in"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] More typo :/
Updating branch refs/heads/master to 7852c713532032ba4f5b79fc31f932b154b72020 (commit) from 4202b5ddcfa2fb2568c6bc0e8bc41dc9275280b3 (commit) commit 7852c713532032ba4f5b79fc31f932b154b72020 Author: Azamat H. Hackimov Date: Sat Feb 19 21:32:13 2011 +0500 More typo :/ configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 3330a0b..2c81e8e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -63,7 +63,7 @@ dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) -XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfce4ui-1], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [5.0]) XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix typo.
Updating branch refs/heads/master to 5bc776be3a93e3d4a9bb526c7434ac018148a1c3 (commit) from 60b7021b26befd2cf87b3c29e69bd6bae5454e4a (commit) commit 5bc776be3a93e3d4a9bb526c7434ac018148a1c3 Author: Azamat H. Hackimov Date: Sat Feb 19 21:06:54 2011 +0500 Fix typo. panel-plugin/Makefile.am |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 5a14fa3..4a4bccd 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -23,7 +23,7 @@ xfce4_xkb_plugin_SOURCES = \ xfce4_xkb_plugin_CFLAGS = \ @LIBXFCE4PANEL_CFLAGS@ \ @GTK_CFLAGS@ \ - @@LIBXFCE4UI_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ @LIBXKLAVIER_CFLAGS@ \ @LIBRSVG_CFLAGS@ \ @@ -36,7 +36,7 @@ xfce4_xkb_plugin_CFLAGS = \ xfce4_xkb_plugin_LDADD = \ @LIBXFCE4PANEL_LIBS@ \ @GTK_LIBS@ \ - @@LIBXFCE4UI_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ @LIBXKLAVIER_LIBS@ \ @LIBWNCK_LIBS@ \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Flag of Georgia (bug #3695)
Updating branch refs/heads/master to cca8c7c871a9c0029f04dba32900fb30e002b7e4 (commit) from 3f46f407344d4780f5a72b34fa7db23b7b7712ff (commit) commit cca8c7c871a9c0029f04dba32900fb30e002b7e4 Author: Azamat H. Hackimov Date: Sat Feb 19 03:04:15 2011 +0500 Flag of Georgia (bug #3695) flags/ge.svg | 37 - 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/flags/ge.svg b/flags/ge.svg index 882ad50..0a6c4c1 100644 --- a/flags/ge.svg +++ b/flags/ge.svg @@ -1,26 +1,13 @@ -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="900" height="600" viewBox="-150 -100 300 200"> - Flag of Georgia - - - - - - - - - - - - - - - - - - - - - - +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="900" height="600" viewBox="0 0 300 200"> + + + + + + + + + + + \ No newline at end of file ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Changelog
Updating branch refs/heads/master to 030faa39c46a339c1f31458dc99805708ac53294 (commit) from 5a5072f3779a6f55580c0c390690f2662f14e3a3 (commit) commit 030faa39c46a339c1f31458dc99805708ac53294 Author: Azamat H. Hackimov Date: Sat Feb 19 04:26:38 2011 +0500 Changelog ChangeLog | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 128c1df..e4053fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2011-02-19 04:06 winterheart + * configure.in.in, panel-plugin/Makefile.am, + panel-plugin/xfce4-xkb-plugin.h panel-plugin/xkb-settings-dialog.c: + New version 0.5.4, switch to libxfce4ui, updated dependencies. Based + on patch taken from Gentoo Portage tree + * panel-plugin/xkb-config.c: Compilation with libxklavier 5.0 API + (bug #6221) + * panel-plugin/xkb-config.c: Prevent crashing when removing from + panel (bug #6122) + * flags/ge.svg: New flag of Georgia (#3695) + * flags/Makefile.am, flags/rs.svg, flags/yu.svg: New flag of Serbia, + removed flag of Yugoslavia as obsoleted (bug #6723) + 2009-03-06 13:10 sasoiliev * panel-plugin/xfce4-xkb-plugin.c, panel-plugin/xkb-config.c, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Revision variable
Updating branch refs/heads/master to 4202b5ddcfa2fb2568c6bc0e8bc41dc9275280b3 (commit) from 5bc776be3a93e3d4a9bb526c7434ac018148a1c3 (commit) commit 4202b5ddcfa2fb2568c6bc0e8bc41dc9275280b3 Author: Azamat H. Hackimov Date: Sat Feb 19 21:11:46 2011 +0500 Revision variable configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index b2c632a..3330a0b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -22,7 +22,7 @@ AC_COPYRIGHT([Copyright (c) 2006-2011 AC_INIT([xfce4-xkb-plugin], [xkb_version], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin]) AC_PREREQ([2.50]) AC_CANONICAL_TARGET() -AC_REVISION([$Id$]) +AC_REVISION([@REVISION@]) dnl *** dnl *** Initialize automake *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Move to git revisions
Updating branch refs/heads/master
to 60b7021b26befd2cf87b3c29e69bd6bae5454e4a (commit)
from 030faa39c46a339c1f31458dc99805708ac53294 (commit)
commit 60b7021b26befd2cf87b3c29e69bd6bae5454e4a
Author: Azamat H. Hackimov
Date: Sat Feb 19 20:58:29 2011 +0500
Move to git revisions
autogen.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 3308482..8acfd34 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ EOF
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+revision=`LC_ALL=C git rev-parse HEAD`
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.in.in" > "configure.in"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix compilation with libxklavier 5.0 (bug #6221). Thank to Samuli Suominen for patch.
Updating branch refs/heads/master to 856114644ea975b7c6a68337ce46083c47efa863 (commit) from 3afbb0e99e037ac4f9d2358e58b4f058f6e3680c (commit) commit 856114644ea975b7c6a68337ce46083c47efa863 Author: Azamat H. Hackimov Date: Sat Feb 19 02:36:49 2011 +0500 Fix compilation with libxklavier 5.0 (bug #6221). Thank to Samuli Suominen for patch. panel-plugin/xkb-config.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c index 352fdf1..fbda374 100644 --- a/panel-plugin/xkb-config.c +++ b/panel-plugin/xkb-config.c @@ -150,7 +150,7 @@ xkb_config_initialize_xkb_options (t_xkb_settings *settings) config->application_map = g_hash_table_new (g_direct_hash, NULL); registry = xkl_config_registry_get_instance (config->engine); -xkl_config_registry_load (registry); +xkl_config_registry_load (registry, FALSE); config_item = xkl_config_item_new (); @@ -214,7 +214,7 @@ xkb_config_finalize () gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); -xkl_engine_stop_listen (config->engine); +xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); } gint @@ -547,7 +547,7 @@ xkb_config_get_xkl_registry () if (!config) return NULL; registry = xkl_config_registry_get_instance (config->engine); -xkl_config_registry_load (registry); +xkl_config_registry_load (registry, FALSE); return registry; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix to prevent crashing when removing from panel (bug #6122) Thank to Lionel Le Folgoc for proposed patch.
Updating branch refs/heads/master
to 3f46f407344d4780f5a72b34fa7db23b7b7712ff (commit)
from 856114644ea975b7c6a68337ce46083c47efa863 (commit)
commit 3f46f407344d4780f5a72b34fa7db23b7b7712ff
Author: Azamat H. Hackimov
Date: Sat Feb 19 02:45:05 2011 +0500
Fix to prevent crashing when removing from panel (bug #6122)
Thank to Lionel Le Folgoc for proposed patch.
panel-plugin/xkb-config.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index fbda374..71b6627 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -290,7 +290,7 @@ xkb_config_update_settings (t_xkb_settings *settings)
if (settings->kbd_config->toggle_option
&& strlen (settings->kbd_config->toggle_option) > 0)
options = g_strdup (settings->kbd_config->toggle_option);
-else options = "";
+else options = g_strdup ("");
if (settings->kbd_config->compose_key_position
&& strlen (settings->kbd_config->compose_key_position) > 0)
@@ -312,11 +312,11 @@ xkb_config_update_settings (t_xkb_settings *settings)
{
prefix = g_strsplit(*opt, ":", 2);
if (settings->kbd_config->toggle_option == NULL
-&& prefix && strcmp(*prefix, "grp") == 0)
+&& prefix && *prefix && strcmp(*prefix, "grp") == 0)
{
settings->kbd_config->toggle_option = g_strdup (*opt);
}
-else if (prefix && strcmp(*prefix, "compose") == 0)
+else if (prefix && *prefix && strcmp(*prefix, "compose") == 0)
{
settings->kbd_config->compose_key_position = g_strdup (*opt);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
