diff options
Diffstat (limited to 'src')
116 files changed, 322 insertions, 322 deletions
diff --git a/src/bookmarks/ephy-bookmark-action-group.c b/src/bookmarks/ephy-bookmark-action-group.c index 8b2d53898..04b63f3c6 100644 --- a/src/bookmarks/ephy-bookmark-action-group.c +++ b/src/bookmarks/ephy-bookmark-action-group.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h index 59c6205fd..5096884b8 100644 --- a/src/bookmarks/ephy-bookmark-action-group.h +++ b/src/bookmarks/ephy-bookmark-action-group.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 09efd132d..2345d6d79 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h index 363d065da..32b65f63e 100644 --- a/src/bookmarks/ephy-bookmark-action.h +++ b/src/bookmarks/ephy-bookmark-action.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c index 8ecee6808..7cba9a403 100644 --- a/src/bookmarks/ephy-bookmark-factory-action.c +++ b/src/bookmarks/ephy-bookmark-factory-action.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-factory-action.h b/src/bookmarks/ephy-bookmark-factory-action.h index cccfe2e7e..d7960a07d 100644 --- a/src/bookmarks/ephy-bookmark-factory-action.h +++ b/src/bookmarks/ephy-bookmark-factory-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 29528a9d8..d216a0b0b 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h index 2c5ee88cd..f43e51327 100644 --- a/src/bookmarks/ephy-bookmark-properties.h +++ b/src/bookmarks/ephy-bookmark-properties.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index d2fd03546..7620f4a40 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h index 23fc36ca1..089e3bb89 100644 --- a/src/bookmarks/ephy-bookmarks-editor.h +++ b/src/bookmarks/ephy-bookmarks-editor.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c index 9a88f8e70..a2af331a6 100644 --- a/src/bookmarks/ephy-bookmarks-export.c +++ b/src/bookmarks/ephy-bookmarks-export.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h index d440f2e2e..445b424e1 100644 --- a/src/bookmarks/ephy-bookmarks-export.h +++ b/src/bookmarks/ephy-bookmarks-export.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 6f8480dfb..56d9d628f 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h index ec1dda557..990cdce7d 100644 --- a/src/bookmarks/ephy-bookmarks-import.h +++ b/src/bookmarks/ephy-bookmarks-import.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index dd124f41b..4d2c3dda5 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h index 1f3094e4b..204ec019a 100644 --- a/src/bookmarks/ephy-bookmarks-menu.h +++ b/src/bookmarks/ephy-bookmarks-menu.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c index 0ccf793bd..dd8531eab 100644 --- a/src/bookmarks/ephy-bookmarks-ui.c +++ b/src/bookmarks/ephy-bookmarks-ui.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h index fe8c0eb56..4da51bdca 100644 --- a/src/bookmarks/ephy-bookmarks-ui.h +++ b/src/bookmarks/ephy-bookmarks-ui.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 6c36c08f1..40e6881cb 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h index b814c227b..ac149235b 100644 --- a/src/bookmarks/ephy-bookmarks.h +++ b/src/bookmarks/ephy-bookmarks.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-nodes-cover.c b/src/bookmarks/ephy-nodes-cover.c index 9f8280165..48a33f16f 100644 --- a/src/bookmarks/ephy-nodes-cover.c +++ b/src/bookmarks/ephy-nodes-cover.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h index bf419a838..3199280ad 100644 --- a/src/bookmarks/ephy-nodes-cover.h +++ b/src/bookmarks/ephy-nodes-cover.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-open-tabs-action.c b/src/bookmarks/ephy-open-tabs-action.c index f14532e9a..5a42f910c 100644 --- a/src/bookmarks/ephy-open-tabs-action.c +++ b/src/bookmarks/ephy-open-tabs-action.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h index 3f679e573..394cf68a3 100644 --- a/src/bookmarks/ephy-open-tabs-action.h +++ b/src/bookmarks/ephy-open-tabs-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-related-action.c b/src/bookmarks/ephy-related-action.c index f383029ae..f65ff3df0 100644 --- a/src/bookmarks/ephy-related-action.c +++ b/src/bookmarks/ephy-related-action.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-related-action.h b/src/bookmarks/ephy-related-action.h index e7789d78c..0dea6840f 100644 --- a/src/bookmarks/ephy-related-action.h +++ b/src/bookmarks/ephy-related-action.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-action-group.c b/src/bookmarks/ephy-topic-action-group.c index d4618b889..7ea88b438 100644 --- a/src/bookmarks/ephy-topic-action-group.c +++ b/src/bookmarks/ephy-topic-action-group.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h index 7f310d3b5..1713e7749 100644 --- a/src/bookmarks/ephy-topic-action-group.h +++ b/src/bookmarks/ephy-topic-action-group.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 9bed16852..921e6fb8d 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h index 9c0d6ad4c..92b0874c4 100644 --- a/src/bookmarks/ephy-topic-action.h +++ b/src/bookmarks/ephy-topic-action.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-factory-action.c b/src/bookmarks/ephy-topic-factory-action.c index 1f907db79..4101f2ef1 100644 --- a/src/bookmarks/ephy-topic-factory-action.c +++ b/src/bookmarks/ephy-topic-factory-action.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topic-factory-action.h b/src/bookmarks/ephy-topic-factory-action.h index 8cd205304..1c1ceaeb7 100644 --- a/src/bookmarks/ephy-topic-factory-action.h +++ b/src/bookmarks/ephy-topic-factory-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c index 953a5c565..42b3bc436 100644 --- a/src/bookmarks/ephy-topics-entry.c +++ b/src/bookmarks/ephy-topics-entry.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h index 45be71940..f00f7b6db 100644 --- a/src/bookmarks/ephy-topics-entry.h +++ b/src/bookmarks/ephy-topics-entry.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c index 13d550fae..3fb2fc142 100644 --- a/src/bookmarks/ephy-topics-palette.c +++ b/src/bookmarks/ephy-topics-palette.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h index 805c82edf..114a4290a 100644 --- a/src/bookmarks/ephy-topics-palette.h +++ b/src/bookmarks/ephy-topics-palette.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-action-helper.c b/src/ephy-action-helper.c index 92f500f8b..6d882d650 100644 --- a/src/ephy-action-helper.c +++ b/src/ephy-action-helper.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h index 93723e57e..fc5e31cd0 100644 --- a/src/ephy-action-helper.h +++ b/src/ephy-action-helper.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-activation.c b/src/ephy-activation.c index 4a0df3cf8..f2346f0ca 100644 --- a/src/ephy-activation.c +++ b/src/ephy-activation.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-activation.h b/src/ephy-activation.h index 92525187b..6605f92aa 100644 --- a/src/ephy-activation.h +++ b/src/ephy-activation.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-automation.c b/src/ephy-automation.c index 03b5b1732..4ee53f792 100644 --- a/src/ephy-automation.c +++ b/src/ephy-automation.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-cert-manager-dialog.c b/src/ephy-cert-manager-dialog.c index 569e80382..9b30190b4 100644 --- a/src/ephy-cert-manager-dialog.c +++ b/src/ephy-cert-manager-dialog.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-cert-manager-dialog.h b/src/ephy-cert-manager-dialog.h index 6d274539d..792ba9bb2 100644 --- a/src/ephy-cert-manager-dialog.h +++ b/src/ephy-cert-manager-dialog.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c index 6691062fd..566cc4a0d 100644 --- a/src/ephy-completion-model.c +++ b/src/ephy-completion-model.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h index 973951ad8..a264ad2fd 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c index 9299bb2dd..df903b6b4 100644 --- a/src/ephy-dbus.c +++ b/src/ephy-dbus.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-dbus.h b/src/ephy-dbus.h index 97cebae5a..61d4eceb3 100644 --- a/src/ephy-dbus.h +++ b/src/ephy-dbus.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index 0ec18fe3c..18788f550 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h index 69eb5e544..184d8b525 100644 --- a/src/ephy-encoding-dialog.h +++ b/src/ephy-encoding-dialog.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index ff88ab341..afac4fc47 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-encoding-menu.h b/src/ephy-encoding-menu.h index 464377171..a0726d888 100644 --- a/src/ephy-encoding-menu.h +++ b/src/ephy-encoding-menu.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-extension.c b/src/ephy-extension.c index 0d492ffcc..8852ab12d 100644 --- a/src/ephy-extension.c +++ b/src/ephy-extension.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-extension.h b/src/ephy-extension.h index 072ec0274..f0ad83e02 100644 --- a/src/ephy-extension.h +++ b/src/ephy-extension.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c index 23ca87996..d91726d46 100644 --- a/src/ephy-extensions-manager.c +++ b/src/ephy-extensions-manager.c @@ -16,7 +16,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-extensions-manager.h b/src/ephy-extensions-manager.h index 7ccfb5171..20475bdd5 100644 --- a/src/ephy-extensions-manager.h +++ b/src/ephy-extensions-manager.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index 23bf19eeb..7c1b85c19 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -14,7 +14,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * $Id$ */ diff --git a/src/ephy-find-toolbar.h b/src/ephy-find-toolbar.h index b40b473d7..c94e877f9 100644 --- a/src/ephy-find-toolbar.h +++ b/src/ephy-find-toolbar.h @@ -14,7 +14,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * $Id$ */ diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c index 44d66f692..b04d12122 100644 --- a/src/ephy-fullscreen-popup.c +++ b/src/ephy-fullscreen-popup.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-fullscreen-popup.h b/src/ephy-fullscreen-popup.h index befe8e883..3ee1279b7 100644 --- a/src/ephy-fullscreen-popup.h +++ b/src/ephy-fullscreen-popup.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c index dee1e0685..25e5e5e53 100644 --- a/src/ephy-go-action.c +++ b/src/ephy-go-action.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-go-action.h b/src/ephy-go-action.h index e3e55b37c..e50848e33 100644 --- a/src/ephy-go-action.h +++ b/src/ephy-go-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index dbcd082c0..e45c1aa63 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h index de27d9ff1..65d8133a3 100644 --- a/src/ephy-history-window.h +++ b/src/ephy-history-window.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-home-action.c b/src/ephy-home-action.c index 672a55f80..b115c4982 100644 --- a/src/ephy-home-action.c +++ b/src/ephy-home-action.c @@ -13,7 +13,7 @@ * * 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. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-home-action.h b/src/ephy-home-action.h index 33b50dd94..6116d87fe 100644 --- a/src/ephy-home-action.h +++ b/src/ephy-home-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c index b3e851ae6..29918bf26 100644 --- a/src/ephy-link-action.c +++ b/src/ephy-link-action.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h index de5f65d27..1aa6d2224 100644 --- a/src/ephy-link-action.h +++ b/src/ephy-link-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-link.c b/src/ephy-link.c index 54d842352..396fa0452 100644 --- a/src/ephy-link.c +++ b/src/ephy-link.c @@ -1,135 +1,135 @@ -/*
- * Copyright © 2004 Christian Persch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-#include "config.h"
-
-#include "ephy-link.h"
-
-#include "ephy-type-builtins.h"
-#include "ephy-marshal.h"
-#include "ephy-signal-accumulator.h"
-#include "ephy-gui.h"
-#include "ephy-debug.h"
-
-enum
-{
- OPEN_LINK,
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void
-ephy_link_base_init (gpointer g_class)
-{
- static gboolean initialised = FALSE;
-
- if (!initialised)
- {
- signals[OPEN_LINK] = g_signal_new
- ("open-link",
- EPHY_TYPE_LINK,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EphyLinkIface, open_link),
- ephy_signal_accumulator_object, ephy_tab_get_type,
- ephy_marshal_OBJECT__STRING_OBJECT_FLAGS,
- EPHY_TYPE_TAB,
- 3,
- G_TYPE_STRING,
- EPHY_TYPE_TAB,
- EPHY_TYPE_LINK_FLAGS);
-
- initialised = TRUE;
- }
-}
-
-GType
-ephy_link_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- const GTypeInfo our_info =
- {
- sizeof (EphyLinkIface),
- ephy_link_base_init,
- NULL,
- };
-
- type = g_type_register_static (G_TYPE_INTERFACE,
- "EphyLink",
- &our_info, (GTypeFlags)0);
- }
-
- return type;
-}
-
-EphyTab *
-ephy_link_open (EphyLink *link,
- const char *address,
- EphyTab *tab,
- EphyLinkFlags flags)
-{
- EphyTab *new_tab = NULL;
-
- LOG ("ephy_link_open address \"%s\" parent-tab %p flags %u", address, tab, flags);
-
- g_signal_emit (link, signals[OPEN_LINK], 0,
- address, tab, flags,
- &new_tab);
-
- return new_tab;
-}
-
-EphyLinkFlags
-ephy_link_flags_from_current_event (void)
-{
- GdkEventType type = GDK_NOTHING;
- guint state = 0, button = (guint) -1;
- EphyLinkFlags flags = 0;
-
- ephy_gui_get_current_event (&type, &state, &button);
-
- if (button == 2 && (type == GDK_BUTTON_PRESS || type == GDK_BUTTON_RELEASE))
- {
- if (state == GDK_SHIFT_MASK)
- {
- flags = EPHY_LINK_NEW_WINDOW;
- }
- else if (state == 0 || state == GDK_CONTROL_MASK)
- {
- flags = EPHY_LINK_NEW_TAB;
- }
- }
- else
- {
- if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))
- {
- flags = EPHY_LINK_NEW_WINDOW;
- }
- else if (state == GDK_CONTROL_MASK)
- {
- flags = EPHY_LINK_NEW_TAB;
- }
- }
-
- return flags;
-}
+/* + * Copyright © 2004 Christian Persch + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + +#include "config.h" + +#include "ephy-link.h" + +#include "ephy-type-builtins.h" +#include "ephy-marshal.h" +#include "ephy-signal-accumulator.h" +#include "ephy-gui.h" +#include "ephy-debug.h" + +enum +{ + OPEN_LINK, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +static void +ephy_link_base_init (gpointer g_class) +{ + static gboolean initialised = FALSE; + + if (!initialised) + { + signals[OPEN_LINK] = g_signal_new + ("open-link", + EPHY_TYPE_LINK, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EphyLinkIface, open_link), + ephy_signal_accumulator_object, ephy_tab_get_type, + ephy_marshal_OBJECT__STRING_OBJECT_FLAGS, + EPHY_TYPE_TAB, + 3, + G_TYPE_STRING, + EPHY_TYPE_TAB, + EPHY_TYPE_LINK_FLAGS); + + initialised = TRUE; + } +} + +GType +ephy_link_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + const GTypeInfo our_info = + { + sizeof (EphyLinkIface), + ephy_link_base_init, + NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, + "EphyLink", + &our_info, (GTypeFlags)0); + } + + return type; +} + +EphyTab * +ephy_link_open (EphyLink *link, + const char *address, + EphyTab *tab, + EphyLinkFlags flags) +{ + EphyTab *new_tab = NULL; + + LOG ("ephy_link_open address \"%s\" parent-tab %p flags %u", address, tab, flags); + + g_signal_emit (link, signals[OPEN_LINK], 0, + address, tab, flags, + &new_tab); + + return new_tab; +} + +EphyLinkFlags +ephy_link_flags_from_current_event (void) +{ + GdkEventType type = GDK_NOTHING; + guint state = 0, button = (guint) -1; + EphyLinkFlags flags = 0; + + ephy_gui_get_current_event (&type, &state, &button); + + if (button == 2 && (type == GDK_BUTTON_PRESS || type == GDK_BUTTON_RELEASE)) + { + if (state == GDK_SHIFT_MASK) + { + flags = EPHY_LINK_NEW_WINDOW; + } + else if (state == 0 || state == GDK_CONTROL_MASK) + { + flags = EPHY_LINK_NEW_TAB; + } + } + else + { + if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) + { + flags = EPHY_LINK_NEW_WINDOW; + } + else if (state == GDK_CONTROL_MASK) + { + flags = EPHY_LINK_NEW_TAB; + } + } + + return flags; +} diff --git a/src/ephy-link.h b/src/ephy-link.h index 48dbc9f3a..2c2998ff7 100644 --- a/src/ephy-link.h +++ b/src/ephy-link.h @@ -1,72 +1,72 @@ -/*
- * Copyright © 2004 Christian Persch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-#ifndef EPHY_LINK_H
-#define EPHY_LINK_H
-
-#include <glib-object.h>
-#include "ephy-tab.h"
-#include "ephy-window.h"
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_LINK (ephy_link_get_type ())
-#define EPHY_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK, EphyLink))
-#define EPHY_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK, EphyLinkIface))
-#define EPHY_IS_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK))
-#define EPHY_IS_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK))
-#define EPHY_LINK_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_LINK, EphyLinkIface))
-
-typedef struct _EphyLink EphyLink;
-typedef struct _EphyLinkIface EphyLinkIface;
-
-typedef enum
-{
- EPHY_LINK_NEW_WINDOW = 1 << 0,
- EPHY_LINK_NEW_TAB = 1 << 1,
- EPHY_LINK_JUMP_TO = 1 << 2,
- EPHY_LINK_ALLOW_FIXUP = 1 << 3
-} EphyLinkFlags;
-
-struct _EphyLinkIface
-{
- GTypeInterface base_iface;
-
- /* Signals */
- EphyTab * (* open_link) (EphyLink *link,
- const char *address,
- EphyTab *tab,
- EphyLinkFlags flags);
-};
-
-GType ephy_link_flags_get_type (void);
-
-GType ephy_link_get_type (void);
-
-EphyTab *ephy_link_open (EphyLink *link,
- const char *address,
- EphyTab *tab,
- EphyLinkFlags flags);
-
-EphyLinkFlags ephy_link_flags_from_current_event (void);
-
-G_END_DECLS
-
-#endif /* EPHY_LINK_H */
+/* + * Copyright © 2004 Christian Persch + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + +#ifndef EPHY_LINK_H +#define EPHY_LINK_H + +#include <glib-object.h> +#include "ephy-tab.h" +#include "ephy-window.h" + +G_BEGIN_DECLS + +#define EPHY_TYPE_LINK (ephy_link_get_type ()) +#define EPHY_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK, EphyLink)) +#define EPHY_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK, EphyLinkIface)) +#define EPHY_IS_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK)) +#define EPHY_IS_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK)) +#define EPHY_LINK_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_LINK, EphyLinkIface)) + +typedef struct _EphyLink EphyLink; +typedef struct _EphyLinkIface EphyLinkIface; + +typedef enum +{ + EPHY_LINK_NEW_WINDOW = 1 << 0, + EPHY_LINK_NEW_TAB = 1 << 1, + EPHY_LINK_JUMP_TO = 1 << 2, + EPHY_LINK_ALLOW_FIXUP = 1 << 3 +} EphyLinkFlags; + +struct _EphyLinkIface +{ + GTypeInterface base_iface; + + /* Signals */ + EphyTab * (* open_link) (EphyLink *link, + const char *address, + EphyTab *tab, + EphyLinkFlags flags); +}; + +GType ephy_link_flags_get_type (void); + +GType ephy_link_get_type (void); + +EphyTab *ephy_link_open (EphyLink *link, + const char *address, + EphyTab *tab, + EphyLinkFlags flags); + +EphyLinkFlags ephy_link_flags_from_current_event (void); + +G_END_DECLS + +#endif /* EPHY_LINK_H */ diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index a4431d813..59aa51573 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-location-action.h b/src/ephy-location-action.h index 359781faf..ca7da42b9 100644 --- a/src/ephy-location-action.h +++ b/src/ephy-location-action.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index 5b00793a0..9fee3f3e9 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h index 4311a0a23..70d480c2e 100644 --- a/src/ephy-lockdown.h +++ b/src/ephy-lockdown.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-main.c b/src/ephy-main.c index 06eb47f8f..828365dd8 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index c9008cb9c..674e759bf 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-navigation-action.h b/src/ephy-navigation-action.h index c8c99513f..67596548d 100644 --- a/src/ephy-navigation-action.h +++ b/src/ephy-navigation-action.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-net-monitor.c b/src/ephy-net-monitor.c index 03f1edc25..971beaf5d 100644 --- a/src/ephy-net-monitor.c +++ b/src/ephy-net-monitor.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-net-monitor.h b/src/ephy-net-monitor.h index b1421445d..6a97094ff 100644 --- a/src/ephy-net-monitor.h +++ b/src/ephy-net-monitor.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index 6b74b3651..d5d140e70 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h index ca1477a01..7677d3489 100644 --- a/src/ephy-notebook.h +++ b/src/ephy-notebook.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python-extension.c b/src/ephy-python-extension.c index 7d3153c1a..6f9c5f812 100644 --- a/src/ephy-python-extension.c +++ b/src/ephy-python-extension.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python-extension.h b/src/ephy-python-extension.h index bf0989d5b..00450f3f7 100644 --- a/src/ephy-python-extension.h +++ b/src/ephy-python-extension.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python-loader.c b/src/ephy-python-loader.c index 473b61ee8..756be4cbd 100644 --- a/src/ephy-python-loader.c +++ b/src/ephy-python-loader.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python-loader.h b/src/ephy-python-loader.h index 2adc200f1..291fd7a15 100644 --- a/src/ephy-python-loader.h +++ b/src/ephy-python-loader.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python.c b/src/ephy-python.c index 58684a35e..cbe707998 100644 --- a/src/ephy-python.c +++ b/src/ephy-python.c @@ -16,7 +16,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-python.h b/src/ephy-python.h index 91aa9ae35..250f3d12e 100644 --- a/src/ephy-python.h +++ b/src/ephy-python.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-session.c b/src/ephy-session.c index b8493abdd..e381e27ff 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-session.h b/src/ephy-session.h index 27e32f03f..e2b01b0da 100644 --- a/src/ephy-session.h +++ b/src/ephy-session.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 1d87daedb..1dae5309b 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-shell.h b/src/ephy-shell.h index e1eca3ba2..8ef5c6a95 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c index 4497eb592..a3de55811 100644 --- a/src/ephy-statusbar.c +++ b/src/ephy-statusbar.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h index 347e191e6..c1a3d4146 100644 --- a/src/ephy-statusbar.h +++ b/src/ephy-statusbar.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 3ac1bf997..568a5ba3d 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -17,7 +17,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-tab.h b/src/ephy-tab.h index f0b5ef75c..1993ba2f5 100644 --- a/src/ephy-tab.h +++ b/src/ephy-tab.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index 0ae78b49e..de79472f0 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-tabs-menu.h b/src/ephy-tabs-menu.h index facd68790..2827a9eb4 100644 --- a/src/ephy-tabs-menu.h +++ b/src/ephy-tabs-menu.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c index db3dc3031..d694be21d 100644 --- a/src/ephy-toolbar-editor.c +++ b/src/ephy-toolbar-editor.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbar-editor.h b/src/ephy-toolbar-editor.h index 20c5e903d..2b9de0621 100644 --- a/src/ephy-toolbar-editor.h +++ b/src/ephy-toolbar-editor.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index fb189e774..48d4dc832 100644 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h index 8ecf66d78..1da72f953 100644 --- a/src/ephy-toolbar.h +++ b/src/ephy-toolbar.h @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c index 8a0462cba..e626aed51 100644 --- a/src/ephy-toolbars-model.c +++ b/src/ephy-toolbars-model.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-toolbars-model.h b/src/ephy-toolbars-model.h index a2b338411..7384016e1 100644 --- a/src/ephy-toolbars-model.h +++ b/src/ephy-toolbars-model.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-window.c b/src/ephy-window.c index e07795b29..0cd18268a 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ephy-window.h b/src/ephy-window.h index 767338898..9642e29cf 100644 --- a/src/ephy-window.h +++ b/src/ephy-window.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/epiphany.override b/src/epiphany.override index 430aa0a3f..379fe0f81 100644 --- a/src/epiphany.override +++ b/src/epiphany.override @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA */ %% diff --git a/src/languages.h b/src/languages.h index ad3f92405..a7e665b49 100644 --- a/src/languages.h +++ b/src/languages.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 006d252be..b0cf397ea 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -15,7 +15,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/pdm-dialog.h b/src/pdm-dialog.h index 9f2e8dd9f..4c3642a47 100644 --- a/src/pdm-dialog.h +++ b/src/pdm-dialog.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/popup-commands.c b/src/popup-commands.c index ea18060ad..27f872e3a 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/popup-commands.h b/src/popup-commands.h index 759ca6083..c770692bd 100644 --- a/src/popup-commands.h +++ b/src/popup-commands.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c index d70d34fc8..59842eca1 100644 --- a/src/ppview-toolbar.c +++ b/src/ppview-toolbar.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/ppview-toolbar.h b/src/ppview-toolbar.h index eadf19aca..18ca91ac2 100644 --- a/src/ppview-toolbar.h +++ b/src/ppview-toolbar.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index c7b3667d0..1dffc4e20 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/prefs-dialog.h b/src/prefs-dialog.h index 4f2716086..707126442 100644 --- a/src/prefs-dialog.h +++ b/src/prefs-dialog.h @@ -14,7 +14,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ diff --git a/src/window-commands.c b/src/window-commands.c index a34501a5d..4e5e45aa8 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ @@ -738,7 +738,7 @@ window_cmd_help_about (GtkAction *action, "GNU General Public License for more details."), N_("You should have received a copy of the GNU General Public License " "along with the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., " - "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA") + "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA") }; EphyEmbedShell *shell; diff --git a/src/window-commands.h b/src/window-commands.h index f25ddbc46..3f193d005 100644 --- a/src/window-commands.h +++ b/src/window-commands.h @@ -13,7 +13,7 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ |