From d6bf9c6f3f40d9500e995fecaeee775e590861c5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 23 May 2007 23:36:01 +0000 Subject: Fix license mess: change everything to GPL git-svn-id: file:///home/lennart/svn/public/padevchooser/trunk@26 e4aeda27-4315-0410-ac56-b21855d76123 --- LICENSE | 27 +++++++++++++-------------- autogen.sh | 4 ++-- doc/style.css | 4 ++-- src/padevchooser.c | 15 +++++++++++---- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index b7b5f53..d511905 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/autogen.sh b/autogen.sh index 16c5738..96ce4ad 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by +# under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # @@ -13,7 +13,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public License +# You should have received a copy of the GNU General Public License # along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. diff --git a/doc/style.css b/doc/style.css index c58aeb4..33df56b 100644 --- a/doc/style.css +++ b/doc/style.css @@ -4,7 +4,7 @@ * This file is part of padevchooser. * * padevchooser is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by + * under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * @@ -13,7 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with padevchooser; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ diff --git a/src/padevchooser.c b/src/padevchooser.c index 3c88031..5577287 100644 --- a/src/padevchooser.c +++ b/src/padevchooser.c @@ -4,7 +4,7 @@ This file is part of padevchooser. padevchooser is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published + it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with padevchooser; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. @@ -142,6 +142,13 @@ static void menu_item_info_free(struct menu_item_info *i) { g_free(i->device); g_free(i->description); g_free(i); + + if (current_sink_menu_item_info == i) + current_sink_menu_item_info = NULL; + if (current_source_menu_item_info == i) + current_source_menu_item_info = NULL; + if (current_server_menu_item_info == i) + current_server_menu_item_info = NULL; } static void notification_closed(void) { @@ -215,7 +222,7 @@ static struct menu_item_info* add_menu_item_info(GHashTable *h, GtkMenu *menu, c gboolean b; m = g_new(struct menu_item_info, 1); - + m->name = g_strdup(i->name); m->server = g_strdup(i->server); m->device = g_strdup(i->device); @@ -322,7 +329,7 @@ static void browse_cb(pa_browser *z, pa_browse_opcode_t c, const pa_browse_info break; case PA_BROWSE_NEW_SINK: - add_menu_item_info(sink_hash_table, sink_submenu, i, (GCallback) sink_change_cb); + add_menu_item_info(sink_hash_table, sink_submenu, i, (GCallback) sink_change_cb); break; case PA_BROWSE_NEW_SOURCE: -- cgit