gmane.comp.gnome.svn

[gnome-settings-daemon] Updated slovak translation

Peter Mráz — 2013-05-25T18:10:58

commit 8debf01aea960843f7160e61d1777aa2995c12a5
Author: Pavol Klačanský <pavol< at >klacansky.com>
Date:   Sat May 25 20:10:49 2013 +0200

    Updated slovak translation

 po/sk.po |  402 +------------------------------------------------------------
 1 files changed, 7 insertions(+), 395 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index b762901..3b246fc 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -14,15 +14,15 < at >< at > msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "settings-daemon&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2013-05-21 07:23+0000\n"
-"PO-Revision-Date: 2013-05-18 10:03+0200\n"
-"Last-Translator: Pavol Klačanský <pavol< at >klacansky.com>\n"
+"PO-Revision-Date: 2013-05-25 20:08+0100\n"
+"Last-Translator: Peter Mráz <etkinator< at >gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list< at >gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; p

[gnome-settings-daemon] Updated slovak translation

Peter Mráz — 2013-05-25T18:10:53

commit aa76b3fd809e367604a88fa50c04d053a7a4a970
Author: Pavol Klačanský <pavol< at >klacansky.com>
Date:   Sat May 25 20:04:32 2013 +0200

    Updated slovak translation

 po/sk.po |  429 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 248 insertions(+), 181 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index 9bfc4a2..b762901 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -13,8 +13,8 < at >< at > msgstr ""
 "Project-Id-Version: gnome-settings-daemon\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "settings-daemon&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-02 12:56+0000\n"
-"PO-Revision-Date: 2013-03-02 17:36+0100\n"
+"POT-Creation-Date: 2013-05-21 07:23+0000\n"
+"PO-Revision-Date: 2013-05-18 10:03+0200\n"
 "Last-Translator: Pavol Klačanský <pavol< at >klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list< at >gnome.org>\n"
 "Language: sk\n"
< at >< at > -308,10 +308,21 < at >< at > msgstr ""
 
 # summary
 #: ../data/org.gnome.settings-daemon.peripherals.w

[seahorse] Updated slovak translation

Peter Mráz — 2013-05-25T17:31:30

commit 93cffc83fb6b64c7ef6b0e3b61b7052684c656f8
Author: Pavol Klačanský <pavol< at >klacansky.com>
Date:   Sat May 25 19:31:24 2013 +0200

    Updated slovak translation

 po/sk.po |   60 ++++++++----------------------------------------------------
 1 files changed, 8 insertions(+), 52 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index c5423f0..91b8c42 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -10,8 +10,8 < at >< at > msgstr ""
 "Project-Id-Version: seahorse\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=seahorse&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-01 18:35+0000\n"
-"PO-Revision-Date: 2013-04-23 17:50+0100\n"
+"POT-Creation-Date: 2013-05-05 17:36+0000\n"
+"PO-Revision-Date: 2013-05-08 12:32+0100\n"
 "Last-Translator: Pavol Klačanský <pavol< at >klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list< at >gnome.org>\n"
 "Language: sk\n"
< at >< at > -198,7 +198,7 < at >< at > msgstr[2] "Naozaj chcete natrvalo odstrániť %d heslá?"
 
 #: ../gkr/seahorse-gkr-item-properties.c:66
 m

[gnome-sudoku] Fix NumberBox events configuration with latestpygobject

Jeremy Bicha — 2013-05-25T17:26:26

commit 31de4e7eb65094bb136d220c540871f366fa22d2
Author: Yanko Kaneti <yaneti< at >declera.com>
Date:   Wed Feb 13 21:15:13 2013 +0200

    Fix NumberBox events configuration with latest pygobject
    
    https://bugzilla.gnome.org/show_bug.cgi?id=693736

 src/lib/number_box.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/lib/number_box.py b/src/lib/number_box.py
index 4087de1..60b255a 100644
--- a/src/lib/number_box.py
+++ b/src/lib/number_box.py
< at >< at > -130,7 +130,7 < at >< at > class NumberBox (Gtk.DrawingArea):
         self.bottom_note_list = []
         self.tinfo = tracker_info.TrackerInfo()
         self.set_property('can-focus', True)
-        self.set_property('events', Gdk.EventMask.ALL_EVENTS_MASK)
+        self.add_events(Gdk.EventMask.ALL_EVENTS_MASK)
         self.connect('button-press-event', self.button_press_cb)
         self.connect('key-release-event', self.key_press_cb)
         self.connect('enter-notify-event', self.pointer_enter_cb)
___________________________________

[gnome-sudoku] Use /usr/bin/python instead of /usr/bin/env python

Jeremy Bicha — 2013-05-25T17:26:21

commit 0858c2c62718691d5e09aa754c9177941296b5ed
Author: Jeremy Bicha <jbicha< at >ubuntu.com>
Date:   Mon Jan 28 22:36:26 2013 -0500

    Use /usr/bin/python instead of /usr/bin/env python
    
    In accordance with Debian & Fedora recommendations
    
    https://bugzilla.gnome.org/show_bug.cgi?id=692765

 src/gnome-sudoku |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/gnome-sudoku b/src/gnome-sudoku
index 69e10be..2515787 100755
--- a/src/gnome-sudoku
+++ b/src/gnome-sudoku
< at >< at > -1,4 +1,4 < at >< at >
-#! /usr/bin/env python
+#! /usr/bin/python
 # -*- coding: utf-8 -*-
 
 # GNOME Sudoku is a simple sudoku generator and player. Sudoku is a
_______________________________________________
commits-list mailing list (read only)
https://mail.gnome.org/mailman/listinfo/commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.

[gtk+] Avoid shadowing a variable

Matthias Clasen — 2013-05-25T17:18:28

commit f83af03579cbdb4b85e86c6cedee7578566fe802
Author: Matthias Clasen <mclasen< at >redhat.com>
Date:   Sat May 25 13:17:57 2013 -0400

    Avoid shadowing a variable
    
    I don't think this broke anything, but it is just inviting
    confusion.

 gtk/gtkwindow.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 4a4e1f3..6970c7d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
< at >< at > -8755,19 +8755,19 < at >< at > gtk_window_compute_hints (GtkWindow   *window,
        *  +-----------+
        */
 #define TEMPORARY_SIZE 10000 /* 10,000 pixels should be bigger than real widget sizes */
-      GtkRequisition requisition;
+      GtkRequisition req;
       int current_width, current_height;
 
       _gtk_widget_override_size_request (geometry_info->widget,
  TEMPORARY_SIZE, TEMPORARY_SIZE,
  &current_width, &current_height);
       gtk_widget_get_preferred_size (widget,
-                                     &requisition, NULL);
+

[gtk+] testwindowsize: show the actual window size

Matthias Clasen — 2013-05-25T17:13:12

commit 47b2248eb396b07662cfebe1b939071aa6563351
Author: Matthias Clasen <mclasen< at >redhat.com>
Date:   Sat May 25 13:12:56 2013 -0400

    testwindowsize: show the actual window size

 tests/testwindowsize.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index f205e30..d11feb1 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
< at >< at > -7,6 +7,20 < at >< at > static GtkWidget *default_width_spin;
 static GtkWidget *default_height_spin;
 static GtkWidget *resizable_check;
 
+static gboolean
+configure_event_cb (GtkWidget *window, GdkEventConfigure *event, GtkLabel *label)
+{
+  gchar *str;
+  gint width, height;
+
+  gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+  str = g_strdup_printf ("%d x %d", width, height);
+  gtk_label_set_label (label, str);
+  g_free (str);
+
+  return FALSE;
+}
+
 static void
 show_dialog (void)
 {
< at >< at > -44,9 +58,15 < at >< at > show_dialog (void)
 
   gtk_box_pack_start (GTK_BOX (gtk_dia

[file-roller] Remove unneeded ur_PK translation file

Piotr Drąg — 2013-05-25T17:09:28

commit 88a5a67ed46e151cbb556a7cb6270ea32f429cda
Author: Piotr Drąg <piotrdrag< at >gmail.com>
Date:   Sat May 25 19:07:55 2013 +0200

    Remove unneeded ur_PK translation file
    
    file-roller's ur_PK.po is the only ur_PK locale file on my system,
    and the correct one is ur.po anyway.

 po/ur_PK.po | 1204 -----------------------------------------------------------
 1 files changed, 0 insertions(+), 1204 deletions(-)
_______________________________________________
commits-list mailing list (read only)
https://mail.gnome.org/mailman/listinfo/commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.

[rhythmbox] [l10n] Add Catalan documentation

Gil Forcada Codinachs — 2013-05-25T16:57:15

commit 8227ad6412182b07a4abd51c0fd071462c5947af
Author: Javi Ribera <javiribera< at >gmail.com>
Date:   Sat May 25 18:55:47 2013 +0200

    [l10n] Add Catalan documentation

 help/Makefile.am |    2 +-
 help/ca/ca.po    | 3269 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3270 insertions(+), 1 deletions(-)
---
diff --git a/help/Makefile.am b/help/Makefile.am
index 1a7bb82..618e5a0 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
< at >< at > -17,4 +17,4 < at >< at > HELP_MEDIA = \
 figures/rb-window.png\
 figures/rb-window-small.png
 
-HELP_LINGUAS = cs da de es el eu fr gl it ja oc pt ro ru sl sv uk zh_CN
+HELP_LINGUAS = ca cs da de es el eu fr gl it ja oc pt ro ru sl sv uk zh_CN
diff --git a/help/ca/ca.po b/help/ca/ca.po
new file mode 100644
index 0000000..1f23325
--- /dev/null
+++ b/help/ca/ca.po
< at >< at > -0,0 +1,3269 < at >< at >
+# Catalan translation for rhythmbox.
+# Copyright (C) 2013 rhythmbox's COPYRIGHT HOLDER
+# This file is distributed under the same license as the rhythmbox package.
+# Javi Ribera <

[rhythmbox] Updated Polish translation

Piotr Drąg — 2013-05-25T16:36:22

commit ee8a7a1871829de84703293d0a3fc2c54e9b7fd5
Author: Piotr Drąg <piotrdrag< at >gmail.com>
Date:   Sat May 25 18:36:04 2013 +0200

    Updated Polish translation

 po/pl.po |  372 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 202 insertions(+), 170 deletions(-)
---
diff --git a/po/pl.po b/po/pl.po
index dcd12cd..49783cd 100644
--- a/po/pl.po
+++ b/po/pl.po
< at >< at > -14,8 +14,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: rhythmbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-14 18:39+0200\n"
-"PO-Revision-Date: 2013-05-14 18:40+0200\n"
+"POT-Creation-Date: 2013-05-25 18:32+0200\n"
+"PO-Revision-Date: 2013-05-25 18:33+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag< at >gmail.com>\n"
 "Language-Team: Polish <gnomepl< at >aviary.pl>\n"
 "Language: pl\n"
< at >< at > -118,7 +118,7 < at >< at > msgstr "Moje najlepiej oceniane"
 
 #: ../data/rhythmbox.desktop.in.in.h:1
 #: ../data/rhythmbox-device.desktop.in.in.h:1 ../shell/rb-shell.c:494
-#: ../shell/rb-shell.c:2324
+#: ../shell/rb-shell.c:2323
 m

[d-feet] Use GTestDBus instead of Systembus and Sessionbus

Thomas Bechtold — 2013-05-25T16:35:11

commit d8a667697b9ccfc131e6ac69a97bc2fc77f60114
Author: Thomas Bechtold <thomasbechtold< at >jpberlin.de>
Date:   Sat May 25 18:34:44 2013 +0200

    Use GTestDBus instead of Systembus and Sessionbus

 src/tests/tests.py |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/src/tests/tests.py b/src/tests/tests.py
index 453bb8d..19d2f09 100755
--- a/src/tests/tests.py
+++ b/src/tests/tests.py
< at >< at > -78,19 +78,17 < at >< at > class IntrospectionHelperTest(unittest.TestCase):
 class AddressInfoTest(unittest.TestCase):
     """tests for the AddressInfo class and the introspection stuff"""
 
-    def test_system_bus(self):
-        """introspect a name on the system bus"""
-        ai = AddressInfo(DATA_DIR, Gio.BusType.SYSTEM, "org.freedesktop.DBus")
+    def setUp(self):
+        self.bus = Gio.TestDBus()
+        self.bus.unset()
+        self.bus.up()
 
-    def test_session_bus(self):
-        """introspect a name on the session bus"""
-        ai = AddressInfo(DATA_DIR, Gio.BusType.S

[d-feet] Use dbus_is_address() instead of dbus_is_supported_address()

Thomas Bechtold — 2013-05-25T16:35:06

commit 1098241821c9de225875ef99ef8bb76201748f85
Author: Thomas Bechtold <thomasbechtold< at >jpberlin.de>
Date:   Sat May 25 18:34:15 2013 +0200

    Use dbus_is_address() instead of dbus_is_supported_address()

 src/dfeet/introspection.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/dfeet/introspection.py b/src/dfeet/introspection.py
index 3224036..52a8b7d 100644
--- a/src/dfeet/introspection.py
+++ b/src/dfeet/introspection.py
< at >< at > -59,7 +59,7 < at >< at > class AddressInfo():
                 self.connection = Gio.bus_get_sync(self.address, None)
                 self.__label_address.set_text(
                     Gio.dbus_address_get_for_bus_sync(self.address, None))
-            elif Gio.dbus_is_supported_address(self.address):
+            elif Gio.dbus_is_address(self.address):
                 self.connection = Gio.DBusConnection.new_for_address_sync(
                     self.address,
                     Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT |
____________________________

[gimp] Updated Polish translation

Piotr Drąg — 2013-05-25T16:31:17

commit b243c7d77d9449f07b222a102ffa8e44308e6521
Author: Piotr Drąg <piotrdrag< at >gmail.com>
Date:   Sat May 25 18:29:47 2013 +0200

    Updated Polish translation

 po/pl.po |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/po/pl.po b/po/pl.po
index 71a8e93..ef09698 100644
--- a/po/pl.po
+++ b/po/pl.po
< at >< at > -26,8 +26,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-18 23:11+0100\n"
-"PO-Revision-Date: 2013-03-18 23:12+0100\n"
+"POT-Creation-Date: 2013-05-25 18:28+0200\n"
+"PO-Revision-Date: 2013-05-25 18:30+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag< at >gmail.com>\n"
 "Language-Team: Polish <gnomepl< at >aviary.pl>\n"
 "Language: pl\n"
< at >< at > -464,7 +464,7 < at >< at > msgstr "Edytor tekstowy"
 msgid "Tool Options"
 msgstr "Opcje narzędzia"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391
 msgid "T

[gimp/gimp-2-8] Updated Polish translation

Piotr Drąg — 2013-05-25T16:30:06

commit 45644a44bad32c4294d57cc33a41ab68d9b005bf
Author: Piotr Drąg <piotrdrag< at >gmail.com>
Date:   Sat May 25 18:29:47 2013 +0200

    Updated Polish translation

 po/pl.po |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/po/pl.po b/po/pl.po
index 71a8e93..ef09698 100644
--- a/po/pl.po
+++ b/po/pl.po
< at >< at > -26,8 +26,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-18 23:11+0100\n"
-"PO-Revision-Date: 2013-03-18 23:12+0100\n"
+"POT-Creation-Date: 2013-05-25 18:28+0200\n"
+"PO-Revision-Date: 2013-05-25 18:30+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag< at >gmail.com>\n"
 "Language-Team: Polish <gnomepl< at >aviary.pl>\n"
 "Language: pl\n"
< at >< at > -464,7 +464,7 < at >< at > msgstr "Edytor tekstowy"
 msgid "Tool Options"
 msgstr "Opcje narzędzia"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391
 msgid "T

[gedit] Updated slovak translation

Peter Mráz — 2013-05-25T16:14:03

commit 529714961d865a01fa31696991dd80f1ac5c1565
Author: Pavol Klačanský <pavol< at >klacansky.com>
Date:   Sat May 25 18:13:57 2013 +0200

    Updated slovak translation

 po/sk.po |  880 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 453 insertions(+), 427 deletions(-)
---
diff --git a/po/sk.po b/po/sk.po
index 7ba02c3..18c5c25 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -12,8 +12,8 < at >< at > msgstr ""
 "Project-Id-Version: gedit\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gedit&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-06 09:03+0000\n"
-"PO-Revision-Date: 2013-03-06 13:56+0000\n"
+"POT-Creation-Date: 2013-05-20 08:43+0000\n"
+"PO-Revision-Date: 2013-05-08 12:48+0100\n"
 "Last-Translator: Pavol Klačanský <pavol< at >klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list< at >gnome.org>\n"
 "Language: sk\n"
< at >< at > -544,17 +544,17 < at >< at > msgstr "Spustí gedit v samostatnom režime"
 
 #: ../gedit/gedit-app.c:184
 msgid "[FILE...] [+LINE[:COLU

[pitivi] bin: Make it possible to run a command right after runningpitivi-git

Thibault Saunier — 2013-05-25T16:10:12

commit 0df01e5d224dbddec6d8eddfd3640bca3c51f620
Author: Thibault Saunier <thibault.saunier< at >collabora.com>
Date:   Sat May 25 12:08:58 2013 -0400

    bin: Make it possible to run a command right after running pitivi-git

 bin/pitivi-git-environment.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 0c42265..4ca09d6 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
< at >< at > -207,7 +207,10 < at >< at > if test ! -d $PITIVI; then
 elif [ "$1" == "--build" ]; then
     # Only build modules without using autogen if not necessary, to save time
     force_autogen=0
-elif [ "$1" != "--force-autogen" ]; then
+    shift
+elif [ "$1" == "--force-autogen" ]; then
+    shift
+else
     # The folders existed, and the user just wants to set the shell environment
     ready_to_run=1
     force_autogen=0
< at >< at > -410,6 +413,11 < at >< at > if [ $ready_to_run == 1 ]; then
           # Display "PTV env:", path, " $ "

[gnome-terminal/gnome-3-8] screen: Don't merge the parent environment

Christian Persch — 2013-05-25T16:06:21

commit 37f4772c08cc657dbb980820e9cee6dde5e583e2
Author: Christian Persch <chpe< at >gnome.org>
Date:   Sat May 25 18:03:30 2013 +0200

    screen: Don't merge the parent environment
    
    Make sure not to inherit the server's environment into the terminal child
    processes, but instead only the environment as passed from the client.
    (cherry picked from commit aaa515ee68e833437add3f4e30e79ed97f4f26d1)

 configure.ac          |    2 +-
 src/terminal-screen.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c4ce86d..93fda51 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -55,7 +55,7 < at >< at > case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.6.0
        VTE_PC_VERSION=-2.90
-       VTE_REQUIRED=0.34.0
+       VTE_REQUIRED=0.34.6
        ;;
 esac
 
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 07de4cd..66183dc 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
< at >< at > -1381,7 +1381,8 < at >< at > terminal_screen_do_e

[gnome-terminal/gnome-3-8] screen: Don't merge the parent environment

Christian Persch — 2013-05-25T16:06:16

commit c44effdcaafbd1de31a3591c89ae7fb4d371251d
Author: Christian Persch <chpe< at >gnome.org>
Date:   Sat May 25 18:00:36 2013 +0200

    screen: Don't merge the parent environment
    
    Since vte already does this, there is no point in doing it before as well.
    (cherry picked from commit e74c3e3fc9b330644a02ce2b7030defbb401a111)

 src/terminal-screen.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index b92471c..07de4cd 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
< at >< at > -1210,13 +1210,6 < at >< at > get_child_environment (TerminalScreen *screen,
 
   env_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
-  /* First take the factory's environment */
-  env = g_listenv ();
-  for (i = 0; env[i]; ++i)
-    g_hash_table_insert (env_table, env[i], g_strdup (g_getenv (env[i])));
-  g_free (env); /* the strings themselves are now owned by the hash table */
-
-  /* and then merge the child environment,

[gnome-terminal] screen: Don't merge the parent environment

Christian Persch — 2013-05-25T16:06:03

commit aaa515ee68e833437add3f4e30e79ed97f4f26d1
Author: Christian Persch <chpe< at >gnome.org>
Date:   Sat May 25 18:03:30 2013 +0200

    screen: Don't merge the parent environment
    
    Make sure not to inherit the server's environment into the terminal child
    processes, but instead only the environment as passed from the client.

 configure.ac          |    2 +-
 src/terminal-screen.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 205b023..71b4bc6 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -56,7 +56,7 < at >< at > case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.6.0
        VTE_PC_VERSION=-2.90
-       VTE_REQUIRED=0.34.0
+       VTE_REQUIRED=0.34.6
        ;;
 esac
 
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 07de4cd..66183dc 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
< at >< at > -1381,7 +1381,8 < at >< at > terminal_screen_do_exec (TerminalScreen *screen,
   GError *err = NULL;
   const char *workin

[gnome-terminal] screen: Don't merge the parent environment

Christian Persch — 2013-05-25T16:05:58

commit e74c3e3fc9b330644a02ce2b7030defbb401a111
Author: Christian Persch <chpe< at >gnome.org>
Date:   Sat May 25 18:00:36 2013 +0200

    screen: Don't merge the parent environment
    
    Since vte already does this, there is no point in doing it before as well.

 src/terminal-screen.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index b92471c..07de4cd 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
< at >< at > -1210,13 +1210,6 < at >< at > get_child_environment (TerminalScreen *screen,
 
   env_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
-  /* First take the factory's environment */
-  env = g_listenv ();
-  for (i = 0; env[i]; ++i)
-    g_hash_table_insert (env_table, env[i], g_strdup (g_getenv (env[i])));
-  g_free (env); /* the strings themselves are now owned by the hash table */
-
-  /* and then merge the child environment, if any */
   env = priv->initial_env;
   if (env)
     {
________________

[vte/vte-0-34] pty: Add a spwan flag to not inherit the parentenvironment

Christian Persch — 2013-05-25T16:05:43

commit 4ab8de471e5dea5f58873abd5cc4a24feaa7210b
Author: Christian Persch <chpe< at >gnome.org>
Date:   Sat May 25 18:04:29 2013 +0200

    pty: Add a spwan flag to not inherit the parent environment
    
    In gnome-terminal we don't want the gnome-terminal-server's environment
    to pollute the child environment, so add the VTE_SPAWN_NO_PARENT_ENVV flag
    that when passed to vte_terminal_fork_command_full() makes it *not*
    merge the parent's environment.

 src/pty.c |   26 ++++++++++++++++++--------
 src/vte.h |    2 ++
 2 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/src/pty.c b/src/pty.c
index b0b0be4..5c6afd5 100644
--- a/src/pty.c
+++ b/src/pty.c
< at >< at > -412,13 +412,17 < at >< at > __vte_pty_get_argv (const char *command,
 /*
  * __vte_pty_merge_environ:
  * < at >envp: environment vector
+ * < at >term_value: the value for the TERM env variable, or %NULL
+ * < at >inherit: whether to use the parent environment
  *
  * Merges < at >envp to the parent environment, and returns a new environment vector.
  *
  * Returns