Update to trunk and some fixes

(bzr r14865.1.14)

1 files changed, 23 insertions, 22 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 1a87a9718..04cf9d02a 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -98,11 +98,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     tabs->append_page(*manage(
         make_scrolled_text(license_text)), _("_License"), true);
 
-#if WITH_GTKMM_3_0
     get_content_area()->pack_end(*manage(tabs), true, true);
-#else
-    get_vbox()->pack_end(*manage(tabs), true, true);
-#endif
 
     tabs->show_all();
 
@@ -130,23 +126,16 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     link->set_selectable(true);
     link->show();
 
-#if WITH_GTKMM_3_0
     get_content_area()->pack_start(*manage(label), false, false);
     get_content_area()->pack_start(*manage(link), false, false);
-#else
-    get_vbox()->pack_start(*manage(label), false, false);
-    get_vbox()->pack_start(*manage(link), false, false);
-#endif
 
-    Gtk::Requisition requisition;
-#if GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_get_preferred_size(reinterpret_cast<GtkWidget*>(gobj()), &requisition, NULL);
-#else
-    gtk_widget_size_request (reinterpret_cast<GtkWidget*>(gobj()), &requisition);
-#endif
+    Gtk::Requisition minimum_size;
+    Gtk::Requisition natural_size;
+    get_preferred_size(minimum_size, natural_size);
+    
     // allow window to shrink
     set_size_request(0, 0);
-    set_default_size(requisition.width, requisition.height);
+    set_default_size(minimum_size.width, minimum_size.height);
 }
 
 
@@ -467,7 +456,8 @@ void AboutBox::initStrings() {
 "Adib Taraben <theadib@gmail.com>, 2004-2014.\n"
 "Alan Monfort <alan.monfort@free.fr>, 2009-2010.\n"
 "Alastair McKinstry <mckinstry@computer.org>, 2000.\n"
-"Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2006.\n"
+"Aleksandar Marković <alleksandar.markovic@gmail.com>, 2015.\n"
+"Aleksandar Urošević <urke@users.sourceforge.net>, 2004-2009.\n"
 "Alessio Frusciante <algol@firenze.linux.it>, 2002, 2003.\n"
 "Alexander Shopov <ash@contact.bg>, 2006.\n"
 "Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2005, 2010-2014.\n"
@@ -499,18 +489,19 @@ void AboutBox::initStrings() {
 "Cédric Gemy <radar.map35@free.fr>, 2006.\n"
 "Daniel Díaz <yosoy@danieldiaz.org>, 2004.\n"
 "Didier Conchaudron <conchaudron@free.fr>, 2003.\n"
-"Dimitris Spingos <dmtrs32@gmail.com>, 2011-2013.\n"
+"Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2011-2015.\n"
 "Dorji Tashi <dorjee_doss@hotmail.com>, 2006.\n"
 "Duarte Loreto <happyguy_pt@hotmail.com> 2002, 2003 (Maintainer).\n"
 "Elias Norberg <elno0959 at student.su.se>, 2009.\n"
 "Equipe de Tradução Inkscape Brasil <www.inkscapebrasil.org>, 2007.\n"
 "Fatih Demir <kabalak@gtranslator.org>, 2000.\n"
-"Firas Hanife <FirasHanife@gmail.com>, 2014-2015.\n"
+"Firas Hanife <FirasHanife@gmail.com>, 2014-2016.\n"
 "Foppe Benedictus <foppe.benedictus@gmail.com>, 2007-2009.\n"
 "Francesc Dorca <f.dorca@filnet.es>, 2003. Traducció sodipodi.\n"
 "Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.\n"
 "Francisco Xosé Vázquez Grandal <fxvazquez@arrakis.es>, 2001.\n"
 "Frederic Rodrigo <f.rodrigo free.fr>, 2004-2005.\n"
+"Ganesh Murmu <g_murmu_in@yahoo.com>, 2014.\n"
 "Ge'ez Frontier Foundation <locales@geez.org>, 2002.\n"
 "George Boukeas <boukeas@gmail.com>, 2011.\n"
 "Heiko Wöhrle <mail@heikowoehrle.de>, 2014.\n"
@@ -528,6 +519,7 @@ void AboutBox::initStrings() {
 "Jeroen van der Vegt <jvdvegt@gmail.com>, 2003, 2005, 2008.\n"
 "Jin-Hwan Jeong <yongdoria@gmail.com>, 2009.\n"
 "Jonathan Ernst <jernst@users.sourceforge.net>, 2006.\n"
+"Jordi Mas i Hernàndez <jmas@softcatala.org>, 2015.\n"
 "Jose Antonio Salgueiro Aquino <developer@telefonica.net>, 2003.\n"
 "Josef Vybiral <josef.vybiral@gmail.com>, 2005-2006.\n"
 "Juarez Rudsatz <juarez@correio.com>, 2004.\n"
@@ -542,10 +534,11 @@ void AboutBox::initStrings() {
 "Kingsley Turner <kingsley@maddogsbreakfast.com.au>, 2006.\n"
 "Kitae <bluetux@gmail.com>, 2006.\n"
 "Kjartan Maraas <kmaraas@gnome.org>, 2000-2002.\n"
-"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2014.\n"
+"Kris De Gussem <Kris.DeGussem@gmail.com>, 2008-2015.\n"
 "Lauris Kaplinski <lauris@ariman.ee>, 2000.\n"
 "Leandro Regueiro <leandro.regueiro@gmail.com>, 2006-2008, 2010.\n"
 "Liu Xiaoqin <liuxqsmile@gmail.com>, 2008.\n"
+"Louni Kandulna <kandulna.louni@gmail.com>, 2014.\n"
 "Luca Bruno <luca.br@uno.it>, 2005.\n"
 "Lucas Vieites Fariña<lucas@codexion.com>, 2003-2013.\n"
 "Mahesh subedi <submanesh@hotmail.com>, 2006.\n"
@@ -561,8 +554,10 @@ void AboutBox::initStrings() {
 "Mufit Eribol <meribol@ere.com.tr>, 2000.\n"
 "Muhammad Bashir Al-Noimi <mhdbnoimi@gmail.com>, 2008.\n"
 "Myckel Habets <myckel@sdf.lonestar.org>, 2008.\n"
+"Nasreen <nasreen_saifee@hotmail.com>, 2013.\n"
 "Nguyen Dinh Trung <nguyendinhtrung141@gmail.com>, 2007, 2008.\n"
-"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2014.\n"
+"Nicolas Dufour <nicoduf@yahoo.fr>, 2008-2016.\n"
+"Paresh prabhu <goa.paresh@Gmail.com>, 2013.\n"
 "Pawan Chitrakar <pchitrakar@gmail.com>, 2006.\n"
 "Przemysław Loesch <p_loesch@poczta.onet.pl>, 2005.\n"
 "Quico Llach <quico@softcatala.org>, 2000. Traducció sodipodi.\n"
@@ -570,6 +565,8 @@ void AboutBox::initStrings() {
 "Riku Leino <tsoots@gmail.com>, 2006-2011.\n"
 "Rune Rønde Laursen <runerl@skjoldhoej.dk>, 2006.\n"
 "Ruud Steltenpool <svg@steltenpower.com>, 2006.\n"
+"Sangeeta <sk@gma.co>, 2011.\n"
+"Savitha <savithasprasad@yahoo.co.in>, 2013.\n"
 "Serdar Soytetir <sendirom@gmail.com>, 2005.\n"
 "shivaken <shivaken@owls-nest.net>, 2004.\n"
 "Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.\n"
@@ -577,8 +574,11 @@ void AboutBox::initStrings() {
 "Spyros Blanas <cid_e@users.sourceforge.net>, 2006, 2011.\n"
 "Stefan Graubner <pflaumenmus92@gmx.net>, 2005.\n"
 "Supranee Thirawatthanasuk <supranee@opentle.org>, 2006.\n"
+"Sushma Joshi <shshma_joshi8266@vsnl.net>, 2011.\n"
+"Sveinn í Felli <sv1@fellsnet.is>, 2014-2015.\n"
+"Sylvain Chiron <chironsylvain@orange.fr>, 2016.\n"
 "Takeshi Aihana <aihana@muc.biglobe.ne.jp>, 2000, 2001.\n"
-"Tim Sheridan <tghs@tghs.net>, 2007-2014.\n"
+"Tim Sheridan <tghs@tghs.net>, 2007-2016.\n"
 "Theppitak Karoonboonyanan <thep@linux.thai.net>, 2006.\n"
 "Thiago Pimentel <thiago.merces@gmail.com>, 2006.\n"
 "Toshifumi Sato <sato@centrosystem.com>, 2005.\n"
@@ -592,6 +592,7 @@ void AboutBox::initStrings() {
 "Vital Khilko <dojlid@mova.org>, 2003.\n"
 "Vitaly Lipatov <lav@altlinux.ru>, 2002, 2004.\n"
 "vonHalenbach <vonHalenbach@users.sourceforge.net>, 2005.\n"
+"vrundeshw <vrundeshw@cdac.in>, 2012.\n"
 "Waluyo Adi Siswanto <was.uthm@gmail.com>, 2011.\n"
 "Wang Li <charlesw1234@163.com>, 2002.\n"
 "Wei-Lun Chao <william.chao@ossii.com.tw>, 2006.\n"