grandr: Changes to 'upstream-unstable'
grandr.glade | 2 +-
src/callbacks.c | 31 ++++++++++++++++++++-----------
src/interface.c | 2 +-
3 files changed, 22 insertions(+), 13 deletions(-)
New commits:
commit 0bd487e19cfc2ff0f7886aa2aab333d98edde7e9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 21 14:12:16 2007 +0200
Fix typo: "Outpus" -> "Outputs"
diff --git a/grandr.glade b/grandr.glade
index f1f0f91..6c21a17 100644
--- a/grandr.glade
+++ b/grandr.glade
@@ -202,7 +202,7 @@ THE SOFTWARE.
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="label" translatable="yes">Outpus </property>
+ <property name="label" translatable="yes">Outputs </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/src/interface.c b/src/interface.c
index 8cc1427..6ef4ab0 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -179,7 +179,7 @@ create_main_win (void)
gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (viewport1), vbox2);
- label9 = gtk_label_new (_("Outpus "));
+ label9 = gtk_label_new (_("Outputs "));
gtk_widget_show (label9);
gtk_box_pack_start (GTK_BOX (vbox2), label9, FALSE, FALSE, 0);
commit ee6a9cc51dd24595687df146cf8bd1bab4085f4d
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Jun 22 00:14:18 2007 +0100
License dialog was displaying GPL, not MIT license
diff --git a/src/callbacks.c b/src/callbacks.c
index 788ca52..f5a4bd4 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -377,17 +377,26 @@ on_about_btn_clicked (GtkButton *button,
{
gchar *authors[] = {"Ming Lin (ming.m.lin@intel.com)", NULL};
gchar *comments = "This GUI is for RandR 1.2 setting\nming.m.lin@intel.com";
- gchar *license = "RandR GUI is free software; you can redistribute it and/or modify\n \
-it under the terms of the GNU General Public License as published by\n \
-the Free Software Foundation; either version 2 of the License, or\n \
-(at your option) any later version.\n\n\
-RandR GUI is distributed in the hope that it will be useful,\n \
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \
-GNU General Public License for more details.\n\n\
-You should have received a copy of the GNU General Public License \n\
-along with RandR GUI; if not, write to the Free Software Foundation, Inc.,\n \
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA";
+ gchar *license =
+"Copyright © 2007 Intel Corporation\n"
+"\n"
+"Permission is hereby granted, free of charge, to any person obtaining a copy\n"
+"of this software and associated documentation files (the “Software”), to deal\n"
+"in the Software without restriction, including without limitation the rights\n"
+"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n"
+"copies of the Software, and to permit persons to whom the Software is\n"
+"furnished to do so, subject to the following conditions:\n"
+"\n"
+"The above copyright notice and this permission notice shall be included in\n"
+"all copies or substantial portions of the Software.\n"
+"\n"
+"THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
+"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
+"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
+"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
+"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n"
+"THE SOFTWARE.";
gtk_show_about_dialog (root_window,
"authors", authors,
Reply to: