[vino] Updated FSF's address
- From: Daniel Mustieles García <dmustieles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vino] Updated FSF's address
- Date: Fri, 31 Jan 2014 13:32:53 +0000 (UTC)
commit 4d0f1673fcfb4ca572bcb380f51779cfd6fc7b59
Author: Daniel Mustieles <daniel mustieles gmail com>
Date: Thu Jan 23 12:58:52 2014 +0100
Updated FSF's address
common/vino-settings-enums.h | 4 +-
po/ar.po | 4 +-
po/da.po | 4 +-
po/lt.po | 20 +-
po/mk.po | 4 +-
po/nb.po | 21 +-
po/nn.po | 21 +-
po/ro.po | 4 +-
po/sv.po | 522 +---------------------------
po/tr.po | 4 +-
server/libvncserver/auth.c | 4 +-
server/libvncserver/corre.c | 4 +-
server/libvncserver/cursor.c | 4 +-
server/libvncserver/cutpaste.c | 4 +-
server/libvncserver/hextile.c | 4 +-
server/libvncserver/rfb/rfb.h | 4 +-
server/libvncserver/rfb/rfbproto.h | 4 +-
server/libvncserver/rfbserver.c | 4 +-
server/libvncserver/rre.c | 4 +-
server/libvncserver/sockets.c | 4 +-
server/libvncserver/stats.c | 4 +-
server/libvncserver/tableinit24.c | 4 +-
server/libvncserver/tableinitcmtemplate.c | 4 +-
server/libvncserver/tableinittctemplate.c | 4 +-
server/libvncserver/tabletrans24template.c | 4 +-
server/libvncserver/tabletranstemplate.c | 4 +-
server/libvncserver/tight.c | 4 +-
server/libvncserver/translate.c | 4 +-
server/libvncserver/vncauth.c | 4 +-
server/libvncserver/zlib.c | 4 +-
server/libvncserver/zrle.c | 4 +-
server/libvncserver/zrleencodetemplate.c | 4 +-
server/libvncserver/zrleoutstream.c | 4 +-
server/libvncserver/zrleoutstream.h | 4 +-
server/libvncserver/zrlepalettehelper.c | 4 +-
server/libvncserver/zrlepalettehelper.h | 4 +-
server/libvncserver/zrletypes.h | 4 +-
server/smclient/eggdesktopfile.c | 3 +-
server/smclient/eggdesktopfile.h | 3 +-
server/smclient/eggsmclient-private.h | 4 +-
server/smclient/eggsmclient-xsmp.c | 4 +-
server/smclient/eggsmclient.c | 4 +-
server/smclient/eggsmclient.h | 4 +-
server/vino-cursor.c | 4 +-
server/vino-cursor.h | 4 +-
server/vino-dbus-error.c | 4 +-
server/vino-dbus-error.h | 4 +-
server/vino-dbus-listener.c | 4 +-
server/vino-dbus-listener.h | 4 +-
server/vino-dbus.c | 4 +-
server/vino-dbus.h | 4 +-
server/vino-fb.c | 4 +-
server/vino-fb.h | 4 +-
server/vino-http.c | 4 +-
server/vino-http.h | 4 +-
server/vino-input.c | 4 +-
server/vino-input.h | 4 +-
server/vino-main.c | 4 +-
server/vino-mdns.c | 4 +-
server/vino-mdns.h | 4 +-
server/vino-prefs.c | 4 +-
server/vino-prefs.h | 4 +-
server/vino-prompt.c | 4 +-
server/vino-prompt.h | 4 +-
server/vino-server.c | 4 +-
server/vino-server.h | 4 +-
server/vino-status-icon.c | 261 +--------------
server/vino-status-icon.h | 4 +-
server/vino-status-tube-icon.c | 4 +-
server/vino-status-tube-icon.h | 4 +-
server/vino-tube-server.c | 4 +-
server/vino-tube-server.h | 4 +-
server/vino-tube-servers-manager.c | 4 +-
server/vino-tube-servers-manager.h | 4 +-
server/vino-upnp.c | 4 +-
server/vino-upnp.h | 4 +-
server/vino-util.c | 4 +-
server/vino-util.h | 4 +-
78 files changed, 78 insertions(+), 1057 deletions(-)
---
diff --git a/common/vino-settings-enums.h b/common/vino-settings-enums.h
index be5acf5..660326e 100644
--- a/common/vino-settings-enums.h
+++ b/common/vino-settings-enums.h
@@ -14,9 +14,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/po/ar.po b/po/ar.po
index 608d0eb..8f4d7df 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -429,9 +429,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"مرخّص تحت رخصة جنو العمومية العامة، نسخة 2\n"
"\n"
diff --git a/po/da.po b/po/da.po
index 3713483..6ee764e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -565,9 +565,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"Underlagt licens GNU General Public License Version 2\n"
"\n"
diff --git a/po/lt.po b/po/lt.po
index 094c3d8..bc5f06d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -577,25 +577,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
-msgstr ""
-"Platinama pagal GNU GPL v2\n"
-"\n"
-"Vino yra laisvoji programinė įranga; galite ją platinti ir / arba "
-"modifikuoti GNU Bendrosios Viešosios Licencijos sąlygomis, paskelbtomis "
-"Laisvosios Programinės Įrangos Fondo; 2-osios arba (jūsų pasirinkimu) bet "
-"kurios vėlesnės licencijos versijos sąlygomis.\n"
-"\n"
-"Vino yra platinama tikintis, kad ji bus naudinga, tačiau nesuteikiant JOKIŲ "
-"GARANTIJŲ; netgi numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI "
-"garantijų. Išsamesnę informaciją rasite GNU Bendrojoje Viešojoje "
-"licencijoje.\n"
-"\n"
-"Turėjote gauti GNU Bendrosios Viešosios licencijos kopiją kartu su Vino; "
-"jeigu negavote, rašykite Free Software Foundation, 59 Temple Place - Suite "
-"330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
#. Translators comment: put your own name here to appear in the about dialog.
#: ../server/vino-status-icon.c:278
diff --git a/po/mk.po b/po/mk.po
index 3134da0..8424ce0 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -508,9 +508,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"Лиценцирано под GNU општата јавна лиценца, верзија 2\n"
"\n"
diff --git a/po/nb.po b/po/nb.po
index f1564cf..8f4dfac 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -442,26 +442,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
-msgstr ""
-"Lisensiert under GNU General Public License versjon 2\n"
-"\n"
-"Vino er fri programvare. Du kan redistribuere og/eller\n"
-"endre programmet under betingelsene gitt i GNU General Public License\n"
-"som utgitt av Free Software Foundation; enten versjon 2\n"
-"av lisensen, eller (hvis du ønsker det) enhver senere versjon.\n"
-"\n"
-"Vino distribueres i håp om at programmet er nyttig, men uten NOEN\n"
-"GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER "
-"ET\n"
-"BESTEMT FORMÅL. Se GNU General Public License for detaljer.\n"
-"\n"
-"Du skal ha mottatt en kopi av GNU General Public License sammen med\n"
-"dette programmet. Hvis dette ikke er tilfelle, kan du skrive til Free "
-"Software\n"
-"Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
#. Translators comment: put your own name here to appear in the about dialog.
#: ../server/vino-status-icon.c:278
diff --git a/po/nn.po b/po/nn.po
index cda54f1..baa0fa9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -596,26 +596,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
-msgstr ""
-"Lisensiert under GNU General Public License versjon 2\n"
-"\n"
-"Vino er fri programvare. Du kan redistribuera og/eller\n"
-"endra programmet under vilkåra gjeven i GNU General Public License\n"
-"som utgjeven av Free Software Foundation; anten versjon 2\n"
-"av lisensen, eller (viss du ynskjer det) ein kvar seinare versjon.\n"
-"\n"
-"Vino vert distribuert i håp om at programmet er nyttig, men utan NOKON\n"
-"GARANTI, ikkje eingong implisitt garanti om at det er SALBART eller PASSER "
-"EIT\n"
-"BESTEMT FORMÅL. Sjå GNU General Public License for detaljar.\n"
-"\n"
-"Du skal ha motteke ein kopi av GNU General Public License saman med\n"
-"dette programmet. Viss dette ikkje er tilfelle, kan du skriva til Free "
-"Software\n"
-"Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
#
#. Translators comment: put your own name here to appear in the about dialog.
diff --git a/po/ro.po b/po/ro.po
index 8fc6c02..176b51a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -544,9 +544,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"Licențiat sub Licența publică generale GNU versiuena 2\n"
"\n"
diff --git a/po/sv.po b/po/sv.po
index 2eb51bb..b74e0ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -471,527 +471,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
-msgstr ""
-"Licensierad under GNU General Public License version 2\n"
-"\n"
-"Vino är fri programvara. Du kan distribuera det och/eller\n"
-"modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-"någon senare version.\n"
-"\n"
-"Vino distribueras i hopp om att det ska vara användbart,\n"
-"men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti\n"
-"om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU\n"
-"General Public License för ytterligare information.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans\n"
-"med detta program. Om inte, skriv till Free Software Foundation,\n"
-"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#. Translators comment: put your own name here to appear in the about dialog.
-#: ../server/vino-status-icon.c:282
-msgid "translator-credits"
-msgstr ""
-"Daniel Nylander <po danielnylander se>\n"
-"Christian Rose\n"
-"\n"
-"Skicka synpunkter på översättningen till\n"
-"<tp-sv listor tp-sv se>."
-
-#: ../server/vino-status-icon.c:288
-msgid "Share your desktop with other users"
-msgstr "Dela ditt skrivbord med andra användare"
-
-#: ../server/vino-status-icon.c:355
-#: ../server/vino-status-tube-icon.c:232
-#, c-format
-msgid "Are you sure you want to disconnect '%s'?"
-msgstr "Är du säker på att du vill koppla från \"%s\"?"
-
-#: ../server/vino-status-icon.c:358
-#, c-format
-msgid "The remote user from '%s' will be disconnected. Are you sure?"
-msgstr "Fjärranvändaren från \"%s\" kommer att kopplas från. Är du säker?"
-
-#: ../server/vino-status-icon.c:364
-msgid "Are you sure you want to disconnect all clients?"
-msgstr "Är du säker på att du vill koppla från alla klienter?"
-
-#: ../server/vino-status-icon.c:366
-msgid "All remote users will be disconnected. Are you sure?"
-msgstr "Alla fjärranvändare kommer att kopplas från. Är du säker?"
-
-#: ../server/vino-status-icon.c:378
-#: ../server/vino-status-tube-icon.c:246
-msgid "Disconnect"
-msgstr "Koppla från"
-
-#: ../server/vino-status-icon.c:404
-#: ../server/vino-status-tube-icon.c:271
-msgid "_Preferences"
-msgstr "_Inställningar"
-
-#: ../server/vino-status-icon.c:419
-msgid "Disconnect all"
-msgstr "Koppla från alla"
-
-#. Translators: %s is a hostname
-#. Translators: %s is the alias of the telepathy contact
-#: ../server/vino-status-icon.c:443
-#: ../server/vino-status-tube-icon.c:284
-#, c-format
-msgid "Disconnect %s"
-msgstr "Koppla från %s"
-
-#: ../server/vino-status-icon.c:464
-#: ../server/vino-status-tube-icon.c:303
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../server/vino-status-icon.c:472
-msgid "_About"
-msgstr "_Om"
-
-#: ../server/vino-status-icon.c:605
-#: ../server/vino-status-tube-icon.c:400
-#, c-format
-msgid "Error initializing libnotify\n"
-msgstr "Fel vid initiering av libnotify\n"
-
-#. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:626
-msgid "Another user is viewing your desktop"
-msgstr "En annan användare ser på ditt skrivbord"
-
-#: ../server/vino-status-icon.c:628
-#, c-format
-msgid "A user on the computer '%s' is remotely viewing your desktop."
-msgstr "En fjärranvändare på datorn \"%s\" ser på ditt skrivbord."
-
-#. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:634
-msgid "Another user is controlling your desktop"
-msgstr "En annan användare fjärrstyr ditt skrivbord"
-
-#: ../server/vino-status-icon.c:636
-#, c-format
-msgid "A user on the computer '%s' is remotely controlling your desktop."
-msgstr "En användare på datorn \"%s\" fjärrstyr ditt skrivbord."
-
-#: ../server/vino-status-icon.c:664
-#: ../server/vino-status-tube-icon.c:437
-#, c-format
-msgid "Error while displaying notification bubble: %s\n"
-msgstr "Fel vid visning av notifieringsbubbla: %s\n"
-
-#: ../server/vino-status-tube-icon.c:235
-#, c-format
-msgid "The remote user '%s' will be disconnected. Are you sure?"
-msgstr "Fjärranvändaren \"%s\" kommer att kopplas från. Är du säker?"
-
-#: ../server/vino-tube-server.c:220
-#: ../server/vino-tube-server.c:249
-msgid "Share my desktop information"
-msgstr "Dela min skrivbordsinformation"
-
-#. Translators: '%s' is the name of a contact, buddy coming from Empathy
-#: ../server/vino-tube-server.c:224
-#, c-format
-msgid "'%s' rejected the desktop sharing invitation."
-msgstr "\"%s\" avvisade inbjudan om skrivbordsdelning."
-
-#. Translators: '%s' is the name of a contact, buddy coming from Empathy
-#: ../server/vino-tube-server.c:228
-#, c-format
-msgid "'%s' disconnected"
-msgstr "\"%s\" kopplade från"
-
-#. Translators: '%s' is the name of a contact, buddy coming from Empathy
-#: ../server/vino-tube-server.c:255
-#, c-format
-msgid "'%s' is remotely controlling your desktop."
-msgstr "\"%s\" fjärrstyr ditt skrivbord."
-
-#. Translators: '%s' is the name of a contact, buddy coming from Empathy
-#: ../server/vino-tube-server.c:264
-#, c-format
-msgid "Waiting for '%s' to connect to the screen."
-msgstr "Väntar på att \"%s\" ska ansluta till skärmen."
-
-#: ../server/vino-util.c:140
-msgid "An error has occurred:"
-msgstr "Ett fel har inträffat:"
-
-#: ../tools/vino-passwd.c:108
-#, c-format
-msgid "Cancelled"
-msgstr "Avbruten"
-
-#: ../tools/vino-passwd.c:115
-#, c-format
-msgid "ERROR: Maximum length of password is %d character. Please, re-enter the password."
-msgid_plural "ERROR: Maximum length of password is %d characters. Please, re-enter the password."
-msgstr[0] "FEL: Maximal längd för lösenord är %d tecken. Ange lösenordet igen."
-msgstr[1] "FEL: Maximal längd för lösenord är %d tecken. Ange lösenordet igen."
-
-#: ../tools/vino-passwd.c:149
-#, c-format
-msgid "Changing Vino password.\n"
-msgstr "Ändrar Vino-lösenord.\n"
-
-#: ../tools/vino-passwd.c:151
-msgid "Enter new Vino password: "
-msgstr "Ange nytt Vino-lösenord: "
-
-#: ../tools/vino-passwd.c:154
-msgid "Retype new Vino password: "
-msgstr "Ange nytt Vino-lösenord igen: "
-
-#: ../tools/vino-passwd.c:160
-#, c-format
-msgid "vino-passwd: password updated successfully.\n"
-msgstr "vino-passwd: lösenordet uppdaterades.\n"
-
-#: ../tools/vino-passwd.c:165
-#, c-format
-msgid "Sorry, passwords do not match.\n"
-msgstr "Tyvärr, lösenorden stämmer inte överens.\n"
-
-#: ../tools/vino-passwd.c:166
-#, c-format
-msgid "vino-passwd: password unchanged.\n"
-msgstr "vino-passwd: lösenordet oförändrat.\n"
-
-#: ../tools/vino-passwd.c:182
-msgid "Show Vino version"
-msgstr "Visa version av Vino"
-
-#: ../tools/vino-passwd.c:191
-msgid "- Updates Vino password"
-msgstr "- Uppdaterar Vino-lösenordet"
-
-#: ../tools/vino-passwd.c:201
-msgid "Run 'vino-passwd --help' to see a full list of available command line options"
-msgstr "Kör \"vino-passwd --help\" för att se en komplett lista över tillgängliga kommandoradsflaggor"
-
-#: ../tools/vino-passwd.c:208
-#, c-format
-msgid "VINO Version %s\n"
-msgstr "VINO version %s\n"
-
-#: ../tools/vino-passwd.c:219
-#, c-format
-msgid "ERROR: You do not have enough permissions to change Vino password.\n"
-msgstr "FEL: Du har inte behörighet att ändra Vino-lösenordet.\n"
-
-#~ msgid "Remote Desktop"
-#~ msgstr "Fjärrskrivbord"
-
-#~ msgid "Enable remote desktop access"
-#~ msgstr "Aktivera åtkomst till fjärrskrivbord"
-
-#~ msgid "Al_ways display an icon"
-#~ msgstr "Visa all_tid en ikon"
-
-#~ msgid "_Configure network automatically to accept connections"
-#~ msgstr "_Konfigurera nätverket automatiskt för att acceptera anslutningar"
-
-#~ msgid "_Never display an icon"
-#~ msgstr "Visa _aldrig en ikon"
-
-#~ msgid "_Only display an icon when there is someone connected"
-#~ msgstr "_Visa endast en ikon när någon är ansluten"
-
-#~ msgid "GNOME Remote Desktop"
-#~ msgstr "GNOME-fjärrskrivbord"
-
-#~ msgid "Maximum size: 8 characters"
-#~ msgstr "Maximal storlek: 8 tecken"
-
-#~ msgid "You will be queried to allow or to refuse every incoming connection"
-#~ msgstr ""
-#~ "Du kommer att bli tillfrågad om att tillåta eller neka varje inkommande "
-#~ "anslutning"
-
-#~ msgid "Remote Desktop server already running; exiting ...\n"
-#~ msgstr "Fjärrskrivbordsservern kör redan. Avslutar...\n"
-
-#~ msgid ""
-#~ "Error while communicating with GConf. Are you logged into a GNOME session?"
-#~ msgstr "Fel vid kommunikation med GConf. Är du inloggad i en GNOME-session?"
-
-#~ msgid "Error message:"
-#~ msgstr "Felmeddelande:"
-
-#~ msgid "_Send address by email"
-#~ msgstr "_Skicka adress med e-post"
-
-#~ msgid "_Copy address to clipboard"
-#~ msgstr "_Kopiera adress till urklipp"
-
-#~ msgid "<b>Security</b>"
-#~ msgstr "<b>Säkerhet</b>"
-
-#~ msgid "<b>Sharing</b>"
-#~ msgstr "<b>Delning</b>"
-
-#~ msgid "Out of memory handling '%s' message"
-#~ msgstr "Slut på minne vid hantering av \"%s\"-meddelande"
-
-#~ msgid "Out of memory registering object path '%s'"
-#~ msgstr "Slut på minne vid registrering av objektsökvägen \"%s\""
-
-#~ msgid "Failed to acquire D-Bus name '%s'\n"
-#~ msgstr "Misslyckades med att få tag på D-Bus-namnet \"%s\"\n"
-
-#~ msgid "Set your remote desktop access preferences"
-#~ msgstr "Ställ in dina inställningar för åtkomst till fjärrskrivbord"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "_Talk to the router and try to open the doors there"
-#~ msgstr "_Prata med routern och försök att öppna dörrarna där"
-
-#~ msgid "gtk-close"
-#~ msgstr "Stäng"
-
-#~ msgid "gtk-help"
-#~ msgstr "Hjälp"
-
-#~ msgid "<b>Network</b>"
-#~ msgstr "<b>Nätverk</b>"
-
-#~ msgid "A_sk you for confirmation"
-#~ msgstr "F_råga dig för bekräftelse"
-
-#~ msgid "Advanced"
-#~ msgstr "Avancerat"
-
-#~ msgid "Disable the _wallpaper when connected"
-#~ msgstr "Inaktivera skr_ivbordsbakgrund när ansluten"
-
-#~ msgid "Disable the wallpaper when successfull connection"
-#~ msgstr "Inaktivera skrivbordsbakgrunden vid lyckad anslutning"
-
-#~ msgid "General"
-#~ msgstr "Allmänt"
-
-#~ msgid ""
-#~ "Remote users' VNC clients accessing the desktop are required to support "
-#~ "encryption"
-#~ msgstr ""
-#~ "Fjärranvändarnas VNC-klienter som ansluter till skrivbordet måste ha stöd "
-#~ "för kryptering"
-
-#~ msgid "Screen will be locked after the last remote client disconnect"
-#~ msgstr ""
-#~ "Skärmen kommer att låsas efter att den sista fjärrklienten kopplar från"
-
-#~ msgid "The server will only accept connections from localhost"
-#~ msgstr "Servern kommer endast att acceptera anslutningar från localhost"
-
-#~ msgid "The server will use another port, instead of the default (5900)"
-#~ msgstr ""
-#~ "Servern kommer att använda en annan port istället för standardporten "
-#~ "(5900)"
-
-#~ msgid "Users can view your desktop using this command:"
-#~ msgstr "Användare kan se ditt skrivbord med hjälp av detta kommando:"
-
-#~ msgid "When a user tries to view or control your desktop:"
-#~ msgstr "När en användare försöker se eller kontrollera ditt skrivbord:"
-
-#~ msgid "_Lock screen on disconnect"
-#~ msgstr "_Lås skärmen vid frånkoppling"
-
-#~ msgid "_Only allow local connections"
-#~ msgstr "Tillåt _endast lokala anslutningar"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lösenord:"
-
-#~ msgid "_Require encryption"
-#~ msgstr "_Kräv kryptering"
-
-#~ msgid "_Use an alternative port:"
-#~ msgstr "A_nvänd en alternativ port:"
-
-#~ msgid ""
-#~ "If true, the server will only accept connections from localhost and "
-#~ "network connections will be rejected. Set this option to true if you wish "
-#~ "to exclusively use a tunneling mechanism to access the server, such as "
-#~ "ssh."
-#~ msgstr ""
-#~ "Om sant, kommer servern endast att tillåta anslutningar från localhost "
-#~ "och nätverksanslutningar kommer att nekas. Ställ in det här alternativet "
-#~ "till sant om du önskar uteslutande använda en tunnelmekanism för att "
-#~ "komma åt servern, såsom ssh."
-
-#~ msgid "Only allow local connections"
-#~ msgstr "Tillåt endast lokala anslutningar"
-
-#~ msgid ""
-#~ "Problem registering the remote desktop server with bonobo-activation; "
-#~ "exiting ...\n"
-#~ msgstr ""
-#~ "Problem vid registrering av fjärrskrivbordsservern i bonobo-activation. "
-#~ "Avslutar...\n"
-
-#~ msgid "Remote desktop server died, restarting\n"
-#~ msgstr "Fjärrskrivbordsservern dog, startar om\n"
-
-#~ msgid "Activation of %s failed: %s\n"
-#~ msgstr "Aktivering av %s misslyckades: %s\n"
-
-#~ msgid "Activation of %s failed: Unknown Error\n"
-#~ msgstr "Aktivering av %s misslyckades: Okänt fel\n"
-
-#~ msgid "Failed to activate remote desktop server: tried too many times\n"
-#~ msgstr ""
-#~ "Misslyckades med att aktivera fjärrskrivbordsservern: försökte för många "
-#~ "gånger\n"
-
-#~ msgid "Starting remote desktop server"
-#~ msgstr "Startar fjärrskrivbordsserver"
-
-#~ msgid "Not starting remote desktop server"
-#~ msgstr "Startar inte fjärrskrivbordsserver"
-
-#~ msgid ""
-#~ "If checked, screen will be locked after the last remote client disconnect"
-#~ msgstr ""
-#~ "Om kryssad kommer skärmen att låsas efter att den sista fjärrklienten "
-#~ "kopplar från"
-
-#~ msgid "<b>Advanced Settings</b>"
-#~ msgstr "<b>Avancerade inställningar</b>"
-
-#~ msgid "failed to register with the message bus"
-#~ msgstr "misslyckades med att registrera mot meddelandebussen"
-
-#~ msgid "not connected to the message bus"
-#~ msgstr "inte ansluten till meddelandebussen"
-
-#~ msgid "Error in dbus"
-#~ msgstr "Fel i dbus"
-
-#~ msgid "The screen to be monitored"
-#~ msgstr "Skärmen som ska övervakas"
-
-#~ msgid "The screen for which to create a VNC server"
-#~ msgstr "Skärmen för vilken en VNC-server ska skapas"
-
-#~ msgid "On Hold"
-#~ msgstr "Vänta"
-
-#~ msgid "Place all clients on hold"
-#~ msgstr "Placera alla klienter i vänteläge"
-
-#~ msgid "Prompt enabled"
-#~ msgstr "Fråga aktiverad"
-
-#~ msgid "Prompt the user about connection attempts"
-#~ msgstr "Fråga användaren om anslutningsförsök"
-
-#~ msgid "View Only"
-#~ msgstr "Endast visning"
-
-#~ msgid "Disallow keyboard/pointer input from clients"
-#~ msgstr "Tillåt inte inmatning från tangentbord/muspekare från klienter"
-
-#~ msgid "Local Only"
-#~ msgstr "Endast lokala"
-
-#~ msgid "Require Encryption"
-#~ msgstr "Kräv kryptering"
-
-#~ msgid "Require clients to use encryption"
-#~ msgstr "Kräv att klienter använder kryptering"
-
-#~ msgid "Authentication methods"
-#~ msgstr "Autentiseringsmetoder"
-
-#~ msgid "The authentication methods this server should allow"
-#~ msgstr "De autentiseringsmetoder som denna server ska tillåta"
-
-#~ msgid "VNC Password"
-#~ msgstr "VNC-lösenord"
-
-#~ msgid ""
-#~ "The password (base64 encoded) used to authenticate types using the "
-#~ "VncAuth method"
-#~ msgstr ""
-#~ "Lösenordet (base64-kodat) som används för att autentisera typer med "
-#~ "VncAuth-metoden"
-
-#~ msgid "Listen on the port specified by the 'alternative-port' property"
-#~ msgstr "Lyssna på porten som angivits av egenskapen \"alternative-port\""
-
-#~ msgid ""
-#~ "Listen on the specified port number if the 'use-alternative-port' "
-#~ "property is TRUE"
-#~ msgstr ""
-#~ "Lyssna på det angivna portnumret om egenskapen \"use-alternative-port\" "
-#~ "är SANT"
-
-#~ msgid "Port server number"
-#~ msgstr "Portnummer för server"
-
-#~ msgid "The port used by this server"
-#~ msgstr "Porten som används av den här servern"
-
-#~ msgid ""
-#~ "There was an error displaying jelp:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Det uppstod ett fel vid visning av hjälp:\n"
-#~ " %s"
-
-#~ msgid "Licensed under the GNU General Public License Version 2"
-#~ msgstr "Licensierad under GNU General Public License version 2"
-
-#~ msgid ""
-#~ "Vino is free software; you can redistribute it and/or\n"
-#~ "modify it under the terms of the GNU General Public License\n"
-#~ "as published by the Free Software Foundation; either version 2\n"
-#~ "of the License, or (at your option) any later version."
-#~ msgstr ""
-#~ "Vino är fri programvara. Du kan distribuera det och/eller\n"
-#~ "modifiera det under villkoren i GNU General Public License, publicerad\n"
-#~ "av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-#~ "någon senare version."
-
-#~ msgid ""
-#~ "Vino 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."
-#~ msgstr ""
-#~ "Vino distribueras i hopp om att det ska vara användbart, men UTAN\n"
-#~ "NÅGON SOM HELST GARANTI, även utan underförstådd garanti\n"
-#~ "om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL.\n"
-#~ "Se GNU General Public License för ytterligare information."
-
-#~ msgid ""
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-#~ "02110-1301, USA."
-#~ msgstr ""
-#~ "Du bör ha fått en kopia av GNU General Public License tillsammans\n"
-#~ "med detta program. Om inte, skriv till Free Software\n"
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-#~ "02110-1301, USA."
+"along with this program; if not, see <http://www.gnu.org/licenses/>."
#~ msgid "GNOME Remote Access"
#~ msgstr "GNOME-fjärråtkomst"
diff --git a/po/tr.po b/po/tr.po
index 022fb72..e821e1c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -558,9 +558,7 @@ msgid ""
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-"02110-1301, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
"GNU Genel Kamu Lisansı Sürüm 2 altında lisanslanmıştır\n"
"\n"
diff --git a/server/libvncserver/auth.c b/server/libvncserver/auth.c
index cfaed55..637091c 100644
--- a/server/libvncserver/auth.c
+++ b/server/libvncserver/auth.c
@@ -21,9 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/corre.c b/server/libvncserver/corre.c
index 8e47801..b826443 100644
--- a/server/libvncserver/corre.c
+++ b/server/libvncserver/corre.c
@@ -22,9 +22,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/cursor.c b/server/libvncserver/cursor.c
index f509360..82aabb1 100644
--- a/server/libvncserver/cursor.c
+++ b/server/libvncserver/cursor.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/cutpaste.c b/server/libvncserver/cutpaste.c
index 6533fd2..b146da4 100644
--- a/server/libvncserver/cutpaste.c
+++ b/server/libvncserver/cutpaste.c
@@ -18,9 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/hextile.c b/server/libvncserver/hextile.c
index 4be1071..99ef6d8 100644
--- a/server/libvncserver/hextile.c
+++ b/server/libvncserver/hextile.c
@@ -20,9 +20,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/rfb/rfb.h b/server/libvncserver/rfb/rfb.h
index 0de79a4..43440a3 100644
--- a/server/libvncserver/rfb/rfb.h
+++ b/server/libvncserver/rfb/rfb.h
@@ -22,9 +22,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#if(defined __cplusplus)
diff --git a/server/libvncserver/rfb/rfbproto.h b/server/libvncserver/rfb/rfbproto.h
index ba98a4f..d23c513 100644
--- a/server/libvncserver/rfb/rfbproto.h
+++ b/server/libvncserver/rfb/rfbproto.h
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
index 1295219..c4599f3 100644
--- a/server/libvncserver/rfbserver.c
+++ b/server/libvncserver/rfbserver.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#define _GNU_SOURCE 1
diff --git a/server/libvncserver/rre.c b/server/libvncserver/rre.c
index 912d06b..8c2168f 100644
--- a/server/libvncserver/rre.c
+++ b/server/libvncserver/rre.c
@@ -21,9 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/sockets.c b/server/libvncserver/sockets.c
index 746a3e5..6eb6c50 100644
--- a/server/libvncserver/sockets.c
+++ b/server/libvncserver/sockets.c
@@ -34,9 +34,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/stats.c b/server/libvncserver/stats.c
index b350d68..7fe6a4c 100644
--- a/server/libvncserver/stats.c
+++ b/server/libvncserver/stats.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/tableinit24.c b/server/libvncserver/tableinit24.c
index 39e9920..c3de74c 100644
--- a/server/libvncserver/tableinit24.c
+++ b/server/libvncserver/tableinit24.c
@@ -18,9 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
static void
diff --git a/server/libvncserver/tableinitcmtemplate.c b/server/libvncserver/tableinitcmtemplate.c
index df01b23..e1e3516 100644
--- a/server/libvncserver/tableinitcmtemplate.c
+++ b/server/libvncserver/tableinitcmtemplate.c
@@ -27,9 +27,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(OUT)
diff --git a/server/libvncserver/tableinittctemplate.c b/server/libvncserver/tableinittctemplate.c
index 8d4f742..ce841fc 100644
--- a/server/libvncserver/tableinittctemplate.c
+++ b/server/libvncserver/tableinittctemplate.c
@@ -29,9 +29,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(OUT)
diff --git a/server/libvncserver/tabletrans24template.c b/server/libvncserver/tabletrans24template.c
index 4b3a0a0..99b6f45 100644
--- a/server/libvncserver/tabletrans24template.c
+++ b/server/libvncserver/tabletrans24template.c
@@ -29,9 +29,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(BPP)
diff --git a/server/libvncserver/tabletranstemplate.c b/server/libvncserver/tabletranstemplate.c
index e83c623..6c2c280 100644
--- a/server/libvncserver/tabletranstemplate.c
+++ b/server/libvncserver/tabletranstemplate.c
@@ -29,9 +29,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(IN) || !defined(OUT)
diff --git a/server/libvncserver/tight.c b/server/libvncserver/tight.c
index 71fd5b6..8ed735f 100644
--- a/server/libvncserver/tight.c
+++ b/server/libvncserver/tight.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
/*#include <stdio.h>*/
diff --git a/server/libvncserver/translate.c b/server/libvncserver/translate.c
index 56d22cd..d8a1e33 100644
--- a/server/libvncserver/translate.c
+++ b/server/libvncserver/translate.c
@@ -18,9 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "rfb/rfb.h"
diff --git a/server/libvncserver/vncauth.c b/server/libvncserver/vncauth.c
index 027f062..e5019c6 100644
--- a/server/libvncserver/vncauth.c
+++ b/server/libvncserver/vncauth.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/server/libvncserver/zlib.c b/server/libvncserver/zlib.c
index 63792b8..9a01778 100644
--- a/server/libvncserver/zlib.c
+++ b/server/libvncserver/zlib.c
@@ -19,9 +19,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*
* For the latest source code, please check:
*
diff --git a/server/libvncserver/zrle.c b/server/libvncserver/zrle.c
index 676fb08..4d6b87a 100644
--- a/server/libvncserver/zrle.c
+++ b/server/libvncserver/zrle.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/server/libvncserver/zrleencodetemplate.c b/server/libvncserver/zrleencodetemplate.c
index 17ef0ad..b71b0d4 100644
--- a/server/libvncserver/zrleencodetemplate.c
+++ b/server/libvncserver/zrleencodetemplate.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/server/libvncserver/zrleoutstream.c b/server/libvncserver/zrleoutstream.c
index d22d649..a236245 100644
--- a/server/libvncserver/zrleoutstream.c
+++ b/server/libvncserver/zrleoutstream.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "zrleoutstream.h"
diff --git a/server/libvncserver/zrleoutstream.h b/server/libvncserver/zrleoutstream.h
index 9e4fe51..81a7af6 100644
--- a/server/libvncserver/zrleoutstream.h
+++ b/server/libvncserver/zrleoutstream.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __ZRLE_OUT_STREAM_H__
diff --git a/server/libvncserver/zrlepalettehelper.c b/server/libvncserver/zrlepalettehelper.c
index d758a26..cdeaa02 100644
--- a/server/libvncserver/zrlepalettehelper.c
+++ b/server/libvncserver/zrlepalettehelper.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#include "zrlepalettehelper.h"
diff --git a/server/libvncserver/zrlepalettehelper.h b/server/libvncserver/zrlepalettehelper.h
index e1213d1..a9ac24f 100644
--- a/server/libvncserver/zrlepalettehelper.h
+++ b/server/libvncserver/zrlepalettehelper.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/server/libvncserver/zrletypes.h b/server/libvncserver/zrletypes.h
index 0df42c9..65efca5 100644
--- a/server/libvncserver/zrletypes.h
+++ b/server/libvncserver/zrletypes.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * along with this software; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __ZRLE_TYPES_H__
diff --git a/server/smclient/eggdesktopfile.c b/server/smclient/eggdesktopfile.c
index 443d5ec..36f01fa 100644
--- a/server/smclient/eggdesktopfile.c
+++ b/server/smclient/eggdesktopfile.c
@@ -17,8 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place -
- * Suite 330, Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
diff --git a/server/smclient/eggdesktopfile.h b/server/smclient/eggdesktopfile.h
index 16c5426..c29dbea 100644
--- a/server/smclient/eggdesktopfile.h
+++ b/server/smclient/eggdesktopfile.h
@@ -13,8 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place -
- * Suite 330, Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
*/
#ifndef __EGG_DESKTOP_FILE_H__
diff --git a/server/smclient/eggsmclient-private.h b/server/smclient/eggsmclient-private.h
index 0c98eee..dd788c0 100644
--- a/server/smclient/eggsmclient-private.h
+++ b/server/smclient/eggsmclient-private.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EGG_SM_CLIENT_PRIVATE_H__
diff --git a/server/smclient/eggsmclient-xsmp.c b/server/smclient/eggsmclient-xsmp.c
index d5cf3b5..b6ab06b 100644
--- a/server/smclient/eggsmclient-xsmp.c
+++ b/server/smclient/eggsmclient-xsmp.c
@@ -16,9 +16,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/server/smclient/eggsmclient.c b/server/smclient/eggsmclient.c
index 92be8a7..eb78b7a 100644
--- a/server/smclient/eggsmclient.c
+++ b/server/smclient/eggsmclient.c
@@ -12,9 +12,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/server/smclient/eggsmclient.h b/server/smclient/eggsmclient.h
index e620b75..33809ff 100644
--- a/server/smclient/eggsmclient.h
+++ b/server/smclient/eggsmclient.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EGG_SM_CLIENT_H__
diff --git a/server/vino-cursor.c b/server/vino-cursor.c
index 30b5310..abcb7a2 100644
--- a/server/vino-cursor.c
+++ b/server/vino-cursor.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-cursor.h b/server/vino-cursor.h
index 6a16a90..4565006 100644
--- a/server/vino-cursor.h
+++ b/server/vino-cursor.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-dbus-error.c b/server/vino-dbus-error.c
index baaa76c..6aa031b 100644
--- a/server/vino-dbus-error.c
+++ b/server/vino-dbus-error.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-dbus-error.h b/server/vino-dbus-error.h
index f15b90a..274299e 100644
--- a/server/vino-dbus-error.h
+++ b/server/vino-dbus-error.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index 97b72f2..4c0eda5 100644
--- a/server/vino-dbus-listener.c
+++ b/server/vino-dbus-listener.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt desrt ca>
*/
diff --git a/server/vino-dbus-listener.h b/server/vino-dbus-listener.h
index 3b8dc9f..545e848 100644
--- a/server/vino-dbus-listener.h
+++ b/server/vino-dbus-listener.h
@@ -14,9 +14,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* William Jon McCann <mccann jhu edu>
diff --git a/server/vino-dbus.c b/server/vino-dbus.c
index 6807ae5..a3ba99b 100644
--- a/server/vino-dbus.c
+++ b/server/vino-dbus.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt desrt ca>
*/
diff --git a/server/vino-dbus.h b/server/vino-dbus.h
index f6e3efc..b9c7c51 100644
--- a/server/vino-dbus.h
+++ b/server/vino-dbus.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt desrt ca>
*/
diff --git a/server/vino-fb.c b/server/vino-fb.c
index 68d1ae6..6459307 100644
--- a/server/vino-fb.c
+++ b/server/vino-fb.c
@@ -15,9 +15,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-fb.h b/server/vino-fb.h
index 720040b..9dc704a 100644
--- a/server/vino-fb.h
+++ b/server/vino-fb.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-http.c b/server/vino-http.c
index 9d1d3a3..b0e5006 100644
--- a/server/vino-http.c
+++ b/server/vino-http.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-http.h b/server/vino-http.h
index cca43d4..01f870f 100644
--- a/server/vino-http.h
+++ b/server/vino-http.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-input.c b/server/vino-input.c
index 8efd6cf..35bb713 100644
--- a/server/vino-input.c
+++ b/server/vino-input.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-input.h b/server/vino-input.h
index 1fb1cf7..25f0c31 100644
--- a/server/vino-input.h
+++ b/server/vino-input.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-main.c b/server/vino-main.c
index 4740a2e..e22ae53 100644
--- a/server/vino-main.c
+++ b/server/vino-main.c
@@ -13,9 +13,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-mdns.c b/server/vino-mdns.c
index 4f7e693..2650b0d 100644
--- a/server/vino-mdns.c
+++ b/server/vino-mdns.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Sebastien Estienne <sebastien estienne gmail com>
diff --git a/server/vino-mdns.h b/server/vino-mdns.h
index a39ddb6..ab17d8e 100644
--- a/server/vino-mdns.h
+++ b/server/vino-mdns.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Sebastien Estienne <sebastien estienne gmail com>
diff --git a/server/vino-prefs.c b/server/vino-prefs.c
index 3aca534..c1568ac 100644
--- a/server/vino-prefs.c
+++ b/server/vino-prefs.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-prefs.h b/server/vino-prefs.h
index ee1d090..7d7b988 100644
--- a/server/vino-prefs.h
+++ b/server/vino-prefs.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-prompt.c b/server/vino-prompt.c
index 85358e1..bf436e9 100644
--- a/server/vino-prompt.c
+++ b/server/vino-prompt.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-prompt.h b/server/vino-prompt.h
index 6c6797c..5189f32 100644
--- a/server/vino-prompt.h
+++ b/server/vino-prompt.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-server.c b/server/vino-server.c
index 8becd52..7edb50e 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-server.h b/server/vino-server.h
index 0e98880..030ad1b 100644
--- a/server/vino-server.h
+++ b/server/vino-server.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
index 53eec02..130bf14 100644
--- a/server/vino-status-icon.c
+++ b/server/vino-status-icon.c
@@ -13,266 +13,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Authors:
- * Jonh Wendell <wendell bani com br>
- * Mark McLoughlin <mark skynet ie>
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gio/gdesktopappinfo.h>
-#include <string.h>
-#include <libnotify/notify.h>
-
-#include "vino-status-icon.h"
-#include "vino-enums.h"
-#include "vino-util.h"
-
-struct _VinoStatusIconPrivate
-{
- GtkMenu *menu;
- VinoServer *server;
- GSList *clients;
- GtkWidget *disconnect_dialog;
- VinoStatusIconVisibility visibility;
-
- NotifyNotification *new_client_notification;
-};
-
-G_DEFINE_TYPE (VinoStatusIcon, vino_status_icon, GTK_TYPE_STATUS_ICON);
-
-enum
-{
- PROP_0,
- PROP_SERVER,
- PROP_VISIBILITY
-};
-
-typedef struct
-{
- VinoStatusIcon *icon;
- VinoClient *client;
-}VinoStatusIconNotify;
-
-static gboolean vino_status_icon_show_new_client_notification (gpointer user_data);
-
-static void
-vino_status_icon_finalize (GObject *object)
-{
- VinoStatusIcon *icon = VINO_STATUS_ICON (object);
-
- if (icon->priv->new_client_notification)
- g_object_unref (icon->priv->new_client_notification);
- icon->priv->new_client_notification = NULL;
-
- if (icon->priv->menu)
- gtk_widget_destroy (GTK_WIDGET(icon->priv->menu));
- icon->priv->menu = NULL;
-
- if (icon->priv->clients)
- g_slist_free (icon->priv->clients);
- icon->priv->clients = NULL;
-
- if (icon->priv->disconnect_dialog)
- gtk_widget_destroy (icon->priv->disconnect_dialog);
- icon->priv->disconnect_dialog = NULL;
-
- G_OBJECT_CLASS (vino_status_icon_parent_class)->finalize (object);
-}
-
-void
-vino_status_icon_update_state (VinoStatusIcon *icon)
-{
- char *tooltip;
- gboolean visible;
-
- g_return_if_fail (VINO_IS_STATUS_ICON (icon));
-
- visible = !vino_server_get_on_hold (icon->priv->server);
-
- tooltip = g_strdup (_("Desktop sharing is enabled"));
-
- if (icon->priv->clients != NULL)
- {
- int n_clients;
-
- n_clients = g_slist_length (icon->priv->clients);
-
- tooltip = g_strdup_printf (ngettext ("One person is viewing your desktop",
- "%d people are viewing your desktop",
- n_clients),
- n_clients);
- visible = (visible) && ( (icon->priv->visibility == VINO_STATUS_ICON_VISIBILITY_CLIENT) ||
- (icon->priv->visibility == VINO_STATUS_ICON_VISIBILITY_ALWAYS) );
- }
- else
- visible = visible && (icon->priv->visibility == VINO_STATUS_ICON_VISIBILITY_ALWAYS);
-
- gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (icon), tooltip);
- gtk_status_icon_set_visible (GTK_STATUS_ICON (icon), visible);
-
- g_free (tooltip);
-}
-
-static void
-vino_status_icon_init (VinoStatusIcon *icon)
-{
- icon->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon, VINO_TYPE_STATUS_ICON, VinoStatusIconPrivate);
-}
-
-static void
-vino_status_icon_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- VinoStatusIcon *icon = VINO_STATUS_ICON (object);
-
- switch (prop_id)
- {
- case PROP_SERVER:
- icon->priv->server = g_value_get_object (value);
- break;
- case PROP_VISIBILITY:
- vino_status_icon_set_visibility (icon, g_value_get_enum (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-vino_status_icon_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- VinoStatusIcon *icon = VINO_STATUS_ICON (object);
-
- switch (prop_id)
- {
- case PROP_SERVER:
- g_value_set_object (value, icon->priv->server);
- break;
- case PROP_VISIBILITY:
- g_value_set_enum (value, icon->priv->visibility);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-VinoStatusIcon *
-vino_status_icon_new (VinoServer *server,
- GdkScreen *screen)
-{
- g_return_val_if_fail (VINO_IS_SERVER (server), NULL);
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
- return g_object_new (VINO_TYPE_STATUS_ICON,
- "icon-name", "preferences-desktop-remote-desktop",
- "server", server,
- "screen", screen,
- NULL);
-}
-
-VinoServer *
-vino_status_icon_get_server (VinoStatusIcon *icon)
-{
- g_return_val_if_fail (VINO_IS_STATUS_ICON (icon), NULL);
-
- return icon->priv->server;
-}
-
-static void
-vino_status_icon_preferences (VinoStatusIcon *icon)
-{
- GdkScreen *screen;
- GDesktopAppInfo *info;
- GdkAppLaunchContext *context;
- GError *error = NULL;
-
- screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
- info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
- if (info == NULL)
- info = g_desktop_app_info_new ("vino-preferences.desktop");
- context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
- if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
- {
- vino_util_show_error (_("Error displaying preferences"),
- error->message,
- NULL);
- g_error_free (error);
- }
-
- g_object_unref (info);
- g_object_unref (context);
-}
-
-static void
-vino_status_icon_help (VinoStatusIcon *icon)
-{
- GdkScreen *screen;
- GError *error = NULL;
-
- screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
- if (!gtk_show_uri (screen,
- "help:gnome-help/sharing-desktop",
- GDK_CURRENT_TIME,
- &error))
- {
- vino_util_show_error (_("Error displaying help"),
- error->message,
- NULL);
- g_error_free (error);
- }
-}
-
-static void
-vino_status_icon_about (VinoStatusIcon *icon)
-{
-
- g_return_if_fail (VINO_IS_STATUS_ICON (icon));
-
- static const gchar * const authors[] = {
- "Mark McLoughlin <mark skynet ie>",
- "Calum Benson <calum benson sun com>",
- "Federico Mena Quintero <federico ximian com>",
- "Sebastien Estienne <sebastien estienne gmail com>",
- "Shaya Potter <spotter cs columbia edu>",
- "Steven Zhang <steven zhang sun com>",
- "Srirama Sharma <srirama sharma wipro com>",
- "Jonh Wendell <wendell bani com br>",
- "David King <amigadave amigadave com>",
- NULL
- };
- static const gchar copyright[] = \
- "Copyright © 2004–2011 Mark McLoughlin\n" \
- "Copyright © 2006–2011 Jonh Wendell\n" \
- "Copyright © 2011 David King";
-
- char *license;
- char *translators;
-
- license = _("Licensed under the GNU General Public License Version 2\n\n"
- "Vino is free software; you can redistribute it and/or\n"
- "modify it under the terms of the GNU General Public License\n"
- "as published by the Free Software Foundation; either version 2\n"
- "of the License, or (at your option) any later version.\n\n"
- "Vino 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 this program; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
- "02110-1301, USA.\n");
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.\n");
/* Translators comment: put your own name here to appear in the about dialog. */
translators = _("translator-credits");
diff --git a/server/vino-status-icon.h b/server/vino-status-icon.h
index a01ec53..9620ea2 100644
--- a/server/vino-status-icon.h
+++ b/server/vino-status-icon.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Jonh Wendell <wendell bani com br>
diff --git a/server/vino-status-tube-icon.c b/server/vino-status-tube-icon.c
index 0a23a23..026dc2c 100644
--- a/server/vino-status-tube-icon.c
+++ b/server/vino-status-tube-icon.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-status-tube-icon.h b/server/vino-status-tube-icon.h
index 2c2f59c..e17ed97 100644
--- a/server/vino-status-tube-icon.h
+++ b/server/vino-status-tube-icon.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-tube-server.c b/server/vino-tube-server.c
index 0bc3806..b6007e3 100644
--- a/server/vino-tube-server.c
+++ b/server/vino-tube-server.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-tube-server.h b/server/vino-tube-server.h
index d8d949b..8768a4b 100644
--- a/server/vino-tube-server.h
+++ b/server/vino-tube-server.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-tube-servers-manager.c b/server/vino-tube-servers-manager.c
index 28ae703..e0434d4 100644
--- a/server/vino-tube-servers-manager.c
+++ b/server/vino-tube-servers-manager.c
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-tube-servers-manager.h b/server/vino-tube-servers-manager.h
index 5939e07..1ae881f 100644
--- a/server/vino-tube-servers-manager.h
+++ b/server/vino-tube-servers-manager.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Arnaud Maillet <arnaud maillet collabora co uk>
diff --git a/server/vino-upnp.c b/server/vino-upnp.c
index 99d7a71..342445f 100644
--- a/server/vino-upnp.c
+++ b/server/vino-upnp.c
@@ -13,9 +13,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Jonh Wendell <wendell bani com br>
diff --git a/server/vino-upnp.h b/server/vino-upnp.h
index 806e753..139f6ce 100644
--- a/server/vino-upnp.h
+++ b/server/vino-upnp.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Jonh Wendell <wendell bani com br>
diff --git a/server/vino-util.c b/server/vino-util.c
index c41f6cb..b7d3eec 100644
--- a/server/vino-util.c
+++ b/server/vino-util.c
@@ -13,9 +13,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Jonh Wendell <wendell bani com br>
diff --git a/server/vino-util.h b/server/vino-util.h
index a93437f..c463bc7 100644
--- a/server/vino-util.h
+++ b/server/vino-util.h
@@ -12,9 +12,7 @@
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Mark McLoughlin <mark skynet ie>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
