Packman Build Service PMBS

yad.changes Changed

yad.spec Changed

yad-0.9.0.tar.bz2/ChangeLog -> yad-0.9.1.tar.bz2/ChangeLog Changed

yad-0.9.0.tar.bz2/NEWS -> yad-0.9.1.tar.bz2/NEWS Changed

yad-0.9.0.tar.bz2/aclocal.m4 -> yad-0.9.1.tar.bz2/aclocal.m4 Changed

yad-0.9.0.tar.bz2/configure -> yad-0.9.1.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for YAD 0.9.0.
+# Generated by GNU Autoconf 2.68 for YAD 0.9.1.
 #
 # Report bugs to <http://code.google.com/p/yad/issues/entry>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='YAD'
 PACKAGE_TARNAME='yad'
-PACKAGE_VERSION='0.9.0'
-PACKAGE_STRING='YAD 0.9.0'
+PACKAGE_VERSION='0.9.1'
+PACKAGE_STRING='YAD 0.9.1'
 PACKAGE_BUGREPORT='http://code.google.com/p/yad/issues/entry'
 PACKAGE_URL='http://code.google.com/p/yad'
 
@@ -763,19 +763,12 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CC
-LDFLAGS
-LIBS
-CPPFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 YAD_CFLAGS
 YAD_LIBS
-YAD_CFLAGS
-YAD_LIBS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -1318,7 +1311,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures YAD 0.9.0 to adapt to many kinds of systems.
+\`configure' configures YAD 0.9.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1384,7 +1377,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of YAD 0.9.0:";;
+ short | recursive ) echo "Configuration of YAD 0.9.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1492,7 +1485,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-YAD configure 0.9.0
+YAD configure 0.9.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1861,7 +1854,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by YAD $as_me 0.9.0, which was
+It was created by YAD $as_me 0.9.1, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
@@ -2676,7 +2669,7 @@
 
 # Define the identity of the package.
 PACKAGE='yad'
- VERSION='0.9.0'
+ VERSION='0.9.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3755,6 +3748,8 @@
 
 
 
+
+
 case "$am__api_version" in
 1.01234)
 	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
@@ -4298,6 +4293,8 @@
 
 
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6978,7 +6975,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by YAD $as_me 0.9.0, which was
+This file was extended by YAD $as_me 0.9.1, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -7045,7 +7042,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-YAD config.status 0.9.0
+YAD config.status 0.9.1
 configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"

yad-0.9.0.tar.bz2/configure.ac -> yad-0.9.1.tar.bz2/configure.ac Changed

yad-0.9.0.tar.bz2/po/LINGUAS -> yad-0.9.1.tar.bz2/po/LINGUAS Changed

yad-0.9.0.tar.bz2/po/ru.po -> yad-0.9.1.tar.bz2/po/ru.po Changed

@@ -108,7 +108,7 @@
 
 #: ../src/notification.c:338 ../src/notification.c:340
 msgid "Yad notification"
-msgstr "Отобразить диалог уведомления"
+msgstr "Диалог уведомлений"
 
 #: ../src/scale.c:39
 #, c-format
@@ -131,7 +131,7 @@
 
 #: ../src/list.c:415
 msgid "Delete row"
-msgstr "Удалитиь строку"
+msgstr "Удалить строку"
 
 #: ../src/list.c:442
 #, c-format
@@ -389,7 +389,7 @@
 
 #: ../src/option.c:340
 msgid "Activate save mode"
-msgstr "Активировать защищенный режим"
+msgstr "Активировать режим сохранения"
 
 #: ../src/option.c:346 ../src/option.c:386 ../src/option.c:492
 msgid "Set output separator character"
@@ -402,7 +402,7 @@
 
 #: ../src/option.c:352
 msgid "Confirm file selection if filename already exists"
-msgstr "Подтверждать выбор файла, если имя файла уже существует"
+msgstr "Подтверждать выбор файла, если файл уже существует"
 
 #: ../src/option.c:353
 msgid "TEXT"
@@ -904,6 +904,3 @@
 #: ../data/yad-icon-browser.desktop.in.h:2
 msgid "Inspect GTK Icon Theme"
 msgstr "Исследование темы иконок GTK"
-
-#~ msgid "Value out of range.\n"
-#~ msgstr "Значение за пределами диапазона.\n"

yad-0.9.0.tar.bz2/po/sk.po -> yad-0.9.1.tar.bz2/po/sk.po Changed

@@ -2,14 +2,14 @@
 # Slovenský preklad balíka YAD.
 # Copyright (C) 2010 THE YAD'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the YAD package.
-# Slavko <linux@slavino.sk>, 2010.
+# Slavko <linux@slavino.sk>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: YAD 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-02-28 12:49+0200\n"
-"PO-Revision-Date: 2010-11-07 11:07+0100\n"
+"PO-Revision-Date: 2011-02-28 18:50+0100\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: Slovak <nomail>\n"
 "Language: \n"
@@ -116,12 +116,12 @@
 #: ../src/scale.c:48
 #, c-format
 msgid "Initial value less than minimal.\n"
-msgstr ""
+msgstr "Počiatočná hodnota je menšia ako minimálna.\n"
 
 #: ../src/scale.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "Initial value greater than maximum.\n"
-msgstr "Maximálna hodnota musí byť väčšia ako minimálna.\n"
+msgstr "Maximálna hodnota je väčšia ako minimálna.\n"
 
 #: ../src/list.c:406
 msgid "Add row"
@@ -215,11 +215,11 @@
 
 #: ../src/option.c:113
 msgid "Use specified icon theme instead of default"
-msgstr ""
+msgstr "Použiť zadanú tému ikon, namiesto predvolenej"
 
 #: ../src/option.c:114
 msgid "THEME"
-msgstr ""
+msgstr "TÉMA"
 
 #: ../src/option.c:119
 msgid "Add dialog button (may be used multiple times)"
@@ -243,7 +243,7 @@
 
 #: ../src/option.c:145
 msgid "Always print result"
-msgstr ""
+msgstr "Vždy vypísať výsledok"
 
 #: ../src/option.c:152
 msgid "Set window sticky"
@@ -311,7 +311,7 @@
 
 #: ../src/option.c:232
 msgid "Alias for --color"
-msgstr ""
+msgstr "Alias pre --color"
 
 #: ../src/option.c:238
 msgid "Set initial color value"
@@ -419,9 +419,9 @@
 msgstr "Zobraziť dialóg Formulár"
 
 #: ../src/option.c:374
-#, fuzzy
 msgid "Add field to form (TYPE - H, RO, NUM, CHK, CB, FL, DIR, FN or CLR)"
-msgstr "Pridať do formulára pole (TYP - H RO, NUM, CHK alebo CB)"
+msgstr ""
+"Pridať do formulára pole (TYP – H RO, NUM, CHK, CB, FL, DIR, FN alebo CLR)"
 
 #: ../src/option.c:375
 msgid "LABEL:TYPE"
@@ -429,16 +429,15 @@
 
 #: ../src/option.c:380
 msgid "Set alignment of fileds labels (left, center or right)"
-msgstr ""
+msgstr "Nastaviť zarovnanie menoviek poli (left, center alebo right)"
 
 #: ../src/option.c:381 ../src/option.c:696
 msgid "TYPE"
 msgstr "TYP"
 
 #: ../src/option.c:392
-#, fuzzy
 msgid "Set separator character for combobox or scale data"
-msgstr "nastaviť znak výstupného oddeľovača"
+msgstr "Nastaviť znak oddeľovača dát rozbaľovacieho zoznamu alebo zväčšenia"
 
 #: ../src/option.c:402
 msgid "Display icons box dialog"
@@ -476,11 +475,11 @@
 
 #: ../src/option.c:445
 msgid "Sort items by name instead of filename"
-msgstr ""
+msgstr "Radiť položky podľa mena namiesto mena súboru"
 
 #: ../src/option.c:451
 msgid "Sort items in descending order"
-msgstr ""
+msgstr "Zoradiť položky zostupne"
 
 #: ../src/option.c:461
 msgid "Display list dialog"
@@ -537,6 +536,8 @@
 #: ../src/option.c:528
 msgid "Set the column expandable by default. 0 sets all columns expandable"
 msgstr ""
+"Nastaviť stĺpec predvolene ako rozšíriteľný. 0 nastavuje všetky stĺpce ako "
+"rozšíriteľné"
 
 #: ../src/option.c:538
 msgid "Display notification"
@@ -551,14 +552,12 @@
 msgstr "Prijímať príkazy zo štandardného vstupu"
 
 #: ../src/option.c:556
-#, fuzzy
 msgid "Set separator character for menu values"
-msgstr "nastaviť znak výstupného oddeľovača"
+msgstr "Nastaviť znak oddeľovača hodnôt menu"
 
 #: ../src/option.c:562
-#, fuzzy
 msgid "Set separator character for menu items"
-msgstr "nastaviť znak výstupného oddeľovača"
+msgstr "Nastaviť znak oddeľovača položiek menu"
 
 #: ../src/option.c:572
 msgid "Display progress indication dialog"
@@ -679,7 +678,7 @@
 msgstr "Verzia pre tlač"
 
 #: ../src/option.c:879
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown align type: %s\n"
 msgstr "Neznámy typ zarovnania: %s\n"
 
@@ -851,17 +850,16 @@
 msgstr "Pri čítaní súboru %s zistené neplatné UTF-8 dáta\n"
 
 #: ../src/form.c:99
-#, fuzzy
 msgid "Select file"
-msgstr "Otvoriť súbor"
+msgstr "Vyberte súbor"
 
 #: ../src/form.c:109
 msgid "Select folder"
-msgstr ""
+msgstr "Vyberte pole"
 
 #: ../src/browser.c:127
 msgid "scalable "
-msgstr ""
+msgstr "scalable "
 
 #: ../src/browser.c:135
 #, c-format
@@ -870,35 +868,38 @@
 "Sizes: %s\n"
 "Filename: %s"
 msgstr ""
+"Meno: %s\n"
+"Veľkosť: %s\n"
+"Meno súboru: %s"
 
 #: ../src/browser.c:136
 msgid "built-in"
-msgstr ""
+msgstr "zabudované"
 
 #. initialize GTK+ and parse the command line arguments
 #: ../src/browser.c:195
 msgid "- Icon browser"
-msgstr ""
+msgstr "– Prezerač ikon"
 
 #: ../src/browser.c:208
 msgid "Icon browser"
-msgstr ""
+msgstr "Prezerač ikon"
 
 #: ../src/browser.c:251
 msgid "Category"
-msgstr ""
+msgstr "Kategória"
 
 #: ../src/browser.c:284
 msgid "Icons"
-msgstr ""
+msgstr "Ikony"

yad-0.9.1.tar.bz2/po/uk.po Added

@@ -0,0 +1,902 @@
+# Ukrainian translation for YAD
+# This file is distributed under the same license as the YAD package.
+#
+# Victor Ananjevsky <ananasik@gmail.com>, 2009-2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-28 12:49+0200\n"
+"PO-Revision-Date: 2009-04-30 16:47+0300\n"
+"Last-Translator: Victor Ananjevsky <ananasik@gmail.com>\n"
+"Language-Team: Ukrainian\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../src/about.c:32
+msgid "translator-credits"
+msgstr "Віктор Ананьєвський <ananasik@gmail.com>"
+
+#: ../src/about.c:34
+msgid ""
+"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 the Free "
+"Software Foundation; either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"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."
+msgstr ""
+"YAD - це вільна програма; ви можете розповсюджувати її та/чи змінювати на умовах "
+"ліцензії GNU General Public License, що опублікована Free Software "
+"Foundation; версії 2 цієї ліцензії, чи (на вашу думку) будь-якою більш "
+"пізнішої версії.\n"
+"Ця програма розповсюджується в сподіванні на те, що вона буде корисною, але "
+"БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, в тому числі без неявної гарантії КОМЕРЦІЙНОЇ "
+"ЦІННОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКИХ ЦІЛЕЙ. Докладніше про це дивіться GNU "
+"General Public License.\n"
+"Ви мали отримати копію GNU General Public License разом з цією програмою; "
+"якщо це не так, напишіть у Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA 02111-1307 USA."
+
+#: ../src/about.c:53
+msgid ""
+"Yet Another Dialog\n"
+"(show dialog boxes from shell scripts)\n"
+"\n"
+"Based on Zenity code\n"
+msgstr ""
+"Yet Another Dialog\n"
+"(Програма для відображення диалогових вікон із скриптов оболонки)\n"
+"\n"
+"Базується на коді Zenity\n"
+
+#: ../src/icons.c:238
+#, c-format
+msgid "Unable to parse file %s: %s"
+msgstr "Не можу розібрати файл %s: %s"
+
+#: ../src/icons.c:255
+#, c-format
+msgid "Unable to open directory %s: %s"
+msgstr "Не можу відкрити каталог %s: %s"
+
+#: ../src/main.c:69 ../src/main.c:167
+#, c-format
+msgid "%d sec"
+msgstr "%d сек"
+
+#: ../src/main.c:105
+#, c-format
+msgid "Error loading window icon %s: %s\n"
+msgstr "Помилка при загрузці іконки вікна %s: %s\n"
+
+#: ../src/main.c:380
+#, c-format
+msgid "Unable parse command line: %s\n"
+msgstr "Не вдається розібрати командну строку: %s\n"
+
+#: ../src/notification.c:72
+#, c-format
+msgid "Could not load notification icon '%s': %s"
+msgstr "Не вдається завантажити іконку '%s': %s"
+
+#: ../src/notification.c:244
+#, c-format
+msgid "Invalid UTF-8 in tooltip!\n"
+msgstr "Неправильна послідовність UTF-8 у підказці!\n"
+
+#: ../src/notification.c:297
+#, c-format
+msgid "Unknown command '%s'\n"
+msgstr "Невідома команда '%s'\n"
+
+#: ../src/notification.c:338 ../src/notification.c:340
+msgid "Yad notification"
+msgstr "Діалог повідомлень"
+
+#: ../src/scale.c:39
+#, c-format
+msgid "Maximum value must be greater than minimum value.\n"
+msgstr "Максимальне значення повинно бути більше, ніж мінімальне.\n"
+
+#: ../src/scale.c:48
+#, c-format
+msgid "Initial value less than minimal.\n"
+msgstr "Початкове значення менше за мінімальне.\n"
+
+#: ../src/scale.c:53
+#, c-format
+msgid "Initial value greater than maximum.\n"
+msgstr "Початкове значенння більше за маскимальне.\n"
+
+#: ../src/list.c:406
+msgid "Add row"
+msgstr "Добавити строку"
+
+#: ../src/list.c:415
+msgid "Delete row"
+msgstr "Видалити строку"
+
+#: ../src/list.c:442
+#, c-format
+msgid "No column titles specified for List dialog.\n"
+msgstr "Не задані заголовоки колонок для діалога зі списком\n"
+
+#: ../src/option.c:53
+msgid "Set the dialog title"
+msgstr "Задати заголовок діалога"
+
+#: ../src/option.c:54
+msgid "TITLE"
+msgstr "ЗАГОЛОВОК"
+
+#: ../src/option.c:59
+msgid "Set the window icon"
+msgstr "Задати іконку діалога"
+
+#: ../src/option.c:60
+msgid "ICONPATH"
+msgstr "ІКОНКА"
+
+#: ../src/option.c:65
+msgid "Set the width"
+msgstr "Задати ширину вікна"
+
+#: ../src/option.c:66
+msgid "WIDTH"
+msgstr "ШИРИНА"
+
+#: ../src/option.c:71
+msgid "Set the height"
+msgstr "Задати висоту вікна"
+
+#: ../src/option.c:72
+msgid "HEIGHT"
+msgstr "ВИСОТА"
+
+#: ../src/option.c:77
+msgid "Set the window geometry"
+msgstr "Задати геометрію вікна"
+
+#: ../src/option.c:78
+msgid "WxH+X+Y"
+msgstr "ВxШ+X+Y"
+
+#: ../src/option.c:83
+msgid "Set dialog timeout in seconds"
+msgstr "Задати врем'я роботи діалога в секундах"
+
+#: ../src/option.c:84
+msgid "TIMEOUT"
+msgstr "ЗАТРИМКА"
+
+#: ../src/option.c:89
+msgid "Show remaining time indicator (top, bottom, left, right)"
+msgstr "Показувати індикатор затримки (top, bottom, left, right)"
+
+#: ../src/option.c:90
+msgid "POS"
+msgstr "ПОЗИЦІЯ"
+
+#: ../src/option.c:95
+msgid "Set the dialog text"
+msgstr "Задати текст діалога"
+
+#: ../src/option.c:96 ../src/option.c:283 ../src/option.c:289
+#: ../src/option.c:295 ../src/option.c:579

yad-0.9.0.tar.bz2/src/entry.c -> yad-0.9.1.tar.bz2/src/entry.c Changed

@@ -72,25 +72,42 @@
 
       if (options.common_data.editable || settings.combo_always_editable)
 	{
+#if GTK_CHECK_VERSION(2,24,0)
+	  c = gtk_combo_box_text_new_with_entry ();
+#else
 	  c = gtk_combo_box_entry_new_text ();
+#endif
 	  entry = gtk_bin_get_child (GTK_BIN (c));
 	}
       else
 	{
+#if GTK_CHECK_VERSION(2,24,0)
+	  c = entry = gtk_combo_box_text_new ();
+#else
 	  c = entry = gtk_combo_box_new_text ();
+#endif
 	  is_combo = TRUE;
 	}
 
       while (options.extra_datai != NULL)
 	{
+#if GTK_CHECK_VERSION(2,24,0)
+	  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (c), options.extra_datai);
+#else
 	  gtk_combo_box_append_text (GTK_COMBO_BOX (c), options.extra_datai);
+#endif
 	  i++;
 	}
 
       if (options.entry_data.entry_text)
   	{
+#if GTK_CHECK_VERSION(2,24,0)
+  	  gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (c),
+  				      options.entry_data.entry_text);
+#else
   	  gtk_combo_box_prepend_text (GTK_COMBO_BOX (c),
   				      options.entry_data.entry_text);
+#endif
   	  gtk_combo_box_set_active (GTK_COMBO_BOX (c), 0);
   	}
     }
@@ -135,7 +152,11 @@
 entry_print_result (void)
 {
   if (is_combo)
+#if GTK_CHECK_VERSION(2,24,0)
+    g_print ("%s\n", gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (entry)));
+#else
     g_print ("%s\n", gtk_combo_box_get_active_text (GTK_COMBO_BOX (entry)));
+#endif
   else
     g_print ("%s\n", gtk_entry_get_text (GTK_ENTRY (entry)));
 }

yad-0.9.0.tar.bz2/src/form.c -> yad-0.9.1.tar.bz2/src/form.c Changed

@@ -86,7 +86,11 @@
 	      gtk_misc_set_alignment (GTK_MISC (l), options.form_data.align, 0.5);
 	      gtk_table_attach (GTK_TABLE (w), l, 0, 1, i, i + 1, GTK_FILL, 0, 5, 5);
 
+#if GTK_CHECK_VERSION(2,24,0)
+	      e = gtk_combo_box_text_new ();
+#else
 	      e = gtk_combo_box_new_text ();
+#endif
 	      gtk_table_attach (GTK_TABLE (w), e, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5);
 	      fields = g_slist_append (fields, e);
 	      break;
@@ -188,7 +192,11 @@
 		  s = g_strsplit (options.extra_datai, options.common_data.item_separator, -1);
 		  while (sj)
 		    {
+#if GTK_CHECK_VERSION(2,24,0)
+		      gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, i)), sj);
+#else
 		      gtk_combo_box_append_text (GTK_COMBO_BOX (g_slist_nth_data (fields, i)), sj);
+#endif
 		      j++;
 		    }
 		  gtk_combo_box_set_active (GTK_COMBO_BOX (g_slist_nth_data (fields, i)), 0);
@@ -255,7 +263,11 @@
 	  break;
 	case YAD_FIELD_COMBO:
 	  g_printf ("%s%s",
+#if GTK_CHECK_VERSION(2,24,0)
+		    gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, i))),
+#else
 		    gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, i))),
+#endif
 		    options.common_data.separator);
 	  break;
 	case YAD_FIELD_FILE:

yad-0.9.0.tar.bz2/src/icons.c -> yad-0.9.1.tar.bz2/src/icons.c Changed

@@ -135,10 +135,18 @@
 	  switch (column_count)
 	    {
 	    case COL_NAME:
-	    case COL_TOOLTIP:
 	    case COL_COMMAND:
 	      gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, string->str, -1);
 	      break;
+	    case COL_TOOLTIP:
+	      {
+		gchar *val;
+
+		val = escape_markup (string->str);
+		gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, val, -1);
+		g_free (val);
+		break;
+	      }
 	    case COL_PIXBUF:
 	      if (options.icons_data.compact)
 		if (*string->str)
@@ -191,6 +199,7 @@
       if (g_key_file_has_group (kf, "Desktop Entry"))
 	{
 	  gint i;
+	  gchar *val;
 
 	  if (options.icons_data.generic)
 	    {
@@ -211,7 +220,9 @@
 	      ent->name = g_strdup (nm);
 	      g_free (nm);
 	    }
-	  ent->comment = g_key_file_get_locale_string (kf, "Desktop Entry", "Comment", NULL, NULL);
+	  val = g_key_file_get_locale_string (kf, "Desktop Entry", "Comment", NULL, NULL);
+	  ent->comment = escape_markup (val);
+	  g_free (val);
 	  ent->command = g_key_file_get_string (kf, "Desktop Entry", "Exec", NULL);
 	  /* remove possible arguments patterns */
 	  for (i = strlen (ent->command); i > 0; i--)

yad-0.9.0.tar.bz2/src/list.c -> yad-0.9.1.tar.bz2/src/list.c Changed

@@ -45,7 +45,7 @@
 
 static void
 toggled_cb (GtkCellRendererToggle *cell,
-	    gchar *path_str, gpointer data)
+            gchar *path_str, gpointer data)
 {
   gint column;
   gboolean fixed;
@@ -107,22 +107,22 @@
       YadColumn *col = (YadColumn *) g_slist_nth_data (options.list_data.columns, i);
 
       switch (col->type)
-	{
-	case YAD_COLUMN_CHECK:
-	  ctypesi = G_TYPE_BOOLEAN;
-	  break;
-	case YAD_COLUMN_NUM:
-	  ctypesi = G_TYPE_INT64;
-	  break;
-	case YAD_COLUMN_IMAGE:
-	  ctypesi = GDK_TYPE_PIXBUF;
-	  break;
-	case YAD_COLUMN_TOOLTIP:
-	case YAD_COLUMN_TEXT:
-	default:
-	  ctypesi = G_TYPE_STRING;
-	  break;
-	}
+        {
+        case YAD_COLUMN_CHECK:
+          ctypesi = G_TYPE_BOOLEAN;
+          break;
+        case YAD_COLUMN_NUM:
+          ctypesi = G_TYPE_INT64;
+          break;
+        case YAD_COLUMN_IMAGE:
+          ctypesi = GDK_TYPE_PIXBUF;
+          break;
+        case YAD_COLUMN_TOOLTIP:
+        case YAD_COLUMN_TEXT:
+        default:
+          ctypesi = G_TYPE_STRING;
+          break;
+        }
     }
 
   store = gtk_list_store_newv (n_columns, ctypes);
@@ -142,44 +142,56 @@
       YadColumn *col = (YadColumn *) g_slist_nth_data (options.list_data.columns, i);
 
       if (i == options.list_data.hide_column - 1)
-	continue;
+        continue;
 
       switch (col->type)
-	{
-	case YAD_COLUMN_CHECK:
-	  renderer = gtk_cell_renderer_toggle_new ();
-	  g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i));
-	  g_signal_connect (renderer, "toggled", G_CALLBACK (toggled_cb), NULL);
-	  column = gtk_tree_view_column_new_with_attributes
-	    (col->name, renderer, "active", i, NULL);
-	  break;
-	case YAD_COLUMN_IMAGE:
-	  renderer = gtk_cell_renderer_pixbuf_new ();
-	  column = gtk_tree_view_column_new_with_attributes
-	    (col->name, renderer, "pixbuf", i, NULL);
-	  break;
-	case YAD_COLUMN_NUM:
-	case YAD_COLUMN_TEXT:
-	case YAD_COLUMN_TOOLTIP:
-	default:
-	  renderer = gtk_cell_renderer_text_new ();
-	  if (options.common_data.editable)
-	    {
-	      g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
-	      g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i));
-	      g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited_cb), NULL);
-	    }
-	  column = gtk_tree_view_column_new_with_attributes
-	    (col->name, renderer, "text", i, NULL);
-	  gtk_tree_view_column_set_sort_column_id (column, i);
-	  gtk_tree_view_column_set_resizable  (column, TRUE);
-	  break;
-	}
+        {
+        case YAD_COLUMN_CHECK:
+          renderer = gtk_cell_renderer_toggle_new ();
+          g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i));
+          g_signal_connect (renderer, "toggled", G_CALLBACK (toggled_cb), NULL);
+          column = gtk_tree_view_column_new_with_attributes
+            (col->name, renderer, "active", i, NULL);
+          break;
+        case YAD_COLUMN_IMAGE:
+          renderer = gtk_cell_renderer_pixbuf_new ();
+          column = gtk_tree_view_column_new_with_attributes
+            (col->name, renderer, "pixbuf", i, NULL);
+          break;
+        case YAD_COLUMN_NUM:
+          renderer = gtk_cell_renderer_text_new ();
+          if (options.common_data.editable)
+            {
+              g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
+              g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i));
+              g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited_cb), NULL);
+            }
+          column = gtk_tree_view_column_new_with_attributes
+            (col->name, renderer, "text", i, NULL);
+          gtk_tree_view_column_set_sort_column_id (column, i);
+          gtk_tree_view_column_set_resizable  (column, TRUE);
+          break;
+        case YAD_COLUMN_TEXT:
+        case YAD_COLUMN_TOOLTIP:
+        default:
+          renderer = gtk_cell_renderer_text_new ();
+          if (options.common_data.editable)
+            {
+              g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
+              g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i));
+              g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited_cb), NULL);
+            }
+          column = gtk_tree_view_column_new_with_attributes
+            (col->name, renderer, "markup", i, NULL);
+          gtk_tree_view_column_set_sort_column_id (column, i);
+          gtk_tree_view_column_set_resizable  (column, TRUE);
+          break;
+        }
       gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), column);
 
       if (i == options.list_data.expand_column - 1 || 
-	  options.list_data.expand_column == 0)
-	gtk_tree_view_column_set_expand (column, TRUE);
+          options.list_data.expand_column == 0)
+        gtk_tree_view_column_set_expand (column, TRUE);
     }
 }
 
@@ -209,9 +221,10 @@
 
       do
         {
-	  YadColumn *col;
-	  GdkPixbuf *pb;
+          YadColumn *col;
+          GdkPixbuf *pb;
           gint status;
+          gchar *val;
 
           do
             {
@@ -222,7 +235,7 @@
                 gtk_main_iteration ();
             }
           while (status == G_IO_STATUS_AGAIN);
-	  strip_new_line (string->str);
+          strip_new_line (string->str);
 
           if (status != G_IO_STATUS_NORMAL)
             {
@@ -230,7 +243,7 @@
                 {
                   g_printerr ("yad_list_handle_stdin(): %s", err->message);
                   g_error_free (err);
-		  err = NULL;
+                  err = NULL;
                 }
               continue;
             }
@@ -243,34 +256,36 @@
               gtk_list_store_append (GTK_LIST_STORE (model), &iter);
             }
 
-	  col = (YadColumn *) g_slist_nth_data (options.list_data.columns, column_count);
-
-	  switch (col->type)
-	    {
-	    case YAD_COLUMN_CHECK:
-	      if (g_ascii_strcasecmp (string->str, "true") == 0)
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, TRUE, -1);
-	      else
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count, FALSE, -1);
-	      break;
-	    case YAD_COLUMN_NUM:
-	      gtk_list_store_set (GTK_LIST_STORE (model), &iter, column_count,
-				  g_ascii_strtoll (string->str, NULL, 10), -1);
-	      break;
-	    case YAD_COLUMN_IMAGE:
-	      pb = get_pixbuf (string->str, YAD_SMALL_ICON);
-	      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				  column_count, pb, -1);
-	      g_object_unref (pb);
-	      break;
-	    case YAD_COLUMN_TEXT:
-	    default:
-	      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				  column_count, string->str, -1);
-	      break;
-	    }
-

yad-0.9.0.tar.bz2/src/util.c -> yad-0.9.1.tar.bz2/src/util.c Changed

@@ -19,6 +19,7 @@
 *
 */
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "yad.h"
@@ -202,3 +203,105 @@
 
 return res;
 }
+
+gchar *
+escape_markup (gchar *str)
+{
+ gchar *res, *buf = str;
+ guint i = 0, len;
+
+ len = strlen (str);
+ res = malloc (len); 
+
+ while (*buf)
+ {
+ switch (*buf)
+ {
+ case '&':
+ len += 4;
+ res = realloc (res, len);
+ strcpy (res + i, "&amp;");
+ i += 5;
+ break;
+ case '<':
+ len += 3;
+ res = realloc (res, len);
+ strcpy (res + i, "&lt;");
+ i += 4;
+ break;
+ case '>':
+ len += 3;
+ res = realloc (res, len);
+ strcpy (res + i, "&gt;");
+ i += 4;
+ break;
+ case '"':
+ len += 5;
+ res = realloc (res, len);
+ strcpy (res + i, "&quot;");
+ i += 6;
+ break;
+ case '\'':
+ len += 5;
+ res = realloc (res, len);
+ strcpy (res + i, "&apos;");
+ i += 6;
+ break;
+ default:
+ *(res + i) = *buf;
+ i++;
+ break;
+ }
+ buf++;
+ }
+ resi = '\0';
+
+ return res;
+}
+
+gchar *
+unescape_markup (gchar *str)
+{
+ gchar *res, *buf = str;
+ guint i = 0;
+
+ res = g_new0 (gchar, strlen (str)); 
+
+ while (*buf)
+ {
+ if (*buf == '&')
+	{
+	 buf++;
+	 if (strncmp (buf, "lt;", 3) == 0)
+	 {
+	 resi = '<';
+	 buf += 3;
+	 }
+	 else if (strncmp (buf, "gt;", 3) == 0)
+	 {
+	 resi = '>';
+	 buf += 3;
+	 }
+	 else if (strncmp (buf, "amp;", 4) == 0)
+	 {
+	 resi = '&';
+	 buf += 4;
+	 }
+	 else if (strncmp (buf, "quot;", 5) == 0)
+	 {
+	 resi = '"';
+	 buf += 5;
+	 }
+	 else if (strncmp (buf, "apos;", 5) == 0)
+	 {
+	 resi = '\'';
+	 buf += 5;
+	 }
+	}	
+ else
+	resi = *buf++;
+ i++;
+ }
+
+ return res;
+}

yad-0.9.0.tar.bz2/src/yad.h -> yad-0.9.1.tar.bz2/src/yad.h Changed

Changes of Revision 8