Download as
Browse Code »

Commit 41a0c7d5dfd946d624083fd167d3e4536e693dc7

Authored by Perry Werneck
2 parents 1f775063 76ff6e22
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Merge remote-tracking branch 'origin/develop'

Showing 3 changed files with 36 additions and 29 deletions   Show diff stats
src/objects/window/terminal.c
  Diff comments   View file @41a0c7d
... ... @@ -313,9 +313,14 @@
313 313 for(ix=0;keys[ix];ix++) {
314 314 g_autofree gchar * value = g_key_file_get_string(descriptor->key_file,"environment",keys[ix],NULL);
315 315 if(value) {
  316 +#ifdef _WIN32
  317 + g_autofree gchar * env = g_strconcat(keys[ix],"=",value,NULL);
  318 + putenv(env);
  319 +#else
316 320 if(setenv(keys[ix],value,1)) {
317 321 g_warning("Can't set \"%s\" to \"%s\"",keys[ix],value);
318 322 }
  323 +#endif // _WIN32
319 324 }
320 325 }
321 326  
... ...
ui/window.xml
  Diff comments   View file @41a0c7d
... ... @@ -179,25 +179,6 @@
179 179 <section>
180 180  
181 181 <item>
182   - <attribute name="label" translatable="yes">Save selected</attribute>
183   - <attribute name="action">win.save-selected</attribute>
184   - </item>
185   -
186   - <item>
187   - <attribute name="label" translatable="yes">Print selected</attribute>
188   - <attribute name="action">win.print-selected</attribute>
189   - </item>
190   -
191   - <item>
192   - <attribute name="label" translatable="yes">Unselect</attribute>
193   - <attribute name="action">win.unselect</attribute>
194   - </item>
195   -
196   - </section>
197   -
198   - <section>
199   -
200   - <item>
201 182 <attribute name="label" translatable="yes">Clear</attribute>
202 183 <attribute name="action">win.clear</attribute>
203 184 </item>
... ... @@ -260,15 +241,36 @@
260 241  
261 242 </submenu>
262 243  
263   - <item>
264   - <attribute name="label" translatable="yes">Disconnect</attribute>
265   - <attribute name="action">win.disconnect</attribute>
266   - </item>
  244 + <section>
267 245  
268   - <item>
269   - <attribute name="label" translatable="yes">Close window</attribute>
270   - <attribute name="action">win.close</attribute>
271   - </item>
  246 + <item>
  247 + <attribute name="label" translatable="yes">Save selected</attribute>
  248 + <attribute name="action">win.save-selected</attribute>
  249 + </item>
  250 +
  251 + <item>
  252 + <attribute name="label" translatable="yes">Print selected</attribute>
  253 + <attribute name="action">win.print-selected</attribute>
  254 + </item>
  255 +
  256 + <item>
  257 + <attribute name="label" translatable="yes">Unselect</attribute>
  258 + <attribute name="action">win.unselect</attribute>
  259 + </item>
  260 +
  261 + </section>
  262 +
  263 + <section>
  264 + <item>
  265 + <attribute name="label" translatable="yes">Disconnect</attribute>
  266 + <attribute name="action">win.disconnect</attribute>
  267 + </item>
  268 +
  269 + <item>
  270 + <attribute name="label" translatable="yes">Close window</attribute>
  271 + <attribute name="action">win.close</attribute>
  272 + </item>
  273 + </section>
272 274  
273 275 </menu>
274 276  
... ...
win/pack.sh
  Diff comments   View file @41a0c7d
... ... @@ -87,16 +87,16 @@ clone()
87 87 BRANCH=${!TEMPVAR}
88 88 fi
89 89  
  90 + echo "Cloning ${1} ${BRANCH}"
90 91 if [ -z ${BRANCH} ]; then
91 92 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
92 93 else
93 94 echo -e "\e]2;Cloning ${1} ${BRANCH}\a"
94   - echo "Cloning ${1} ${BRANCH}"
95 95 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
96 96 fi
97 97  
98 98 if [ "$?" != "0" ]; then
99   - failed "Can't get sources for ${1}"
  99 + failed "Can't get ${BRANCH} sources for ${1}"
100 100 fi
101 101  
102 102 }
... ...