diff options
Diffstat (limited to 'src/fe-gtk')
-rw-r--r-- | src/fe-gtk/about.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/ascii.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/banlist.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/chanlist.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/dccgui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/editlist.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/fe-gtk.c | 17 | ||||
-rw-r--r-- | src/fe-gtk/fkeys.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/gtkutil.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/ignoregui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/maingui.c | 10 | ||||
-rw-r--r-- | src/fe-gtk/menu.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/notifygui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/palette.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/pixmaps.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/plugin-tray.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/plugingui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/rawlog.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/search.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/sexy-iso-codes.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/sexy-iso-codes.h | 4 | ||||
-rw-r--r-- | src/fe-gtk/sexy-spell-entry.c | 3 | ||||
-rw-r--r-- | src/fe-gtk/sexy-spell-entry.h | 3 | ||||
-rw-r--r-- | src/fe-gtk/textgui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/urlgrab.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/userlistgui.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/xtext.c | 2 |
27 files changed, 44 insertions, 41 deletions
diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index 48136d13..647d6603 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/ascii.c b/src/fe-gtk/ascii.c index 85dcf26d..06621cd7 100644 --- a/src/fe-gtk/ascii.c +++ b/src/fe-gtk/ascii.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index f91be2fc..a783ea07 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index ac44bdb1..c2cc6fcb 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 60881959..6cfcd8b7 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c index af241e04..c1be5b23 100644 --- a/src/fe-gtk/editlist.c +++ b/src/fe-gtk/editlist.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index f589b1b0..57ffa2f6 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> @@ -1022,21 +1022,26 @@ fe_open_url_inner (const char *url) #elif defined __APPLE__ try_browser ("open", NULL, url); /* on Mac you can just 'open http://foo.bar/' */ #else + + /* lets try what gtk has built in first. */ + if (gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL)) + return; + /* universal desktop URL opener (from xdg-utils). Supports gnome,kde,xfce4. */ if (try_browser ("xdg-open", NULL, url)) return; - /* try to detect GNOME */ + /* try to detect GNOME (this env variable is depreciated) */ if (g_getenv ("GNOME_DESKTOP_SESSION_ID")) { - if (try_browser ("gnome-open", NULL, url)) /* Gnome 2.4+ has this */ + if (try_browser ("gvfs-open", NULL, url)) return; } /* try to detect KDE */ if (g_getenv ("KDE_FULL_SESSION")) { - if (try_browser ("kfmclient", "exec", url)) + if (try_browser ("kde-open", NULL, url)) return; } @@ -1044,8 +1049,8 @@ fe_open_url_inner (const char *url) if (try_browser ("firefox", NULL, url)) return; - /* fresh out of ideas... */ - try_browser ("mozilla", NULL, url); + /* fresh out of ideas... i hear chromium is popular */ + try_browser ("chromium", NULL, url); #endif } diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 4e0cd4a3..e606dfd5 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index a3ef1396..0484de83 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _FILE_OFFSET_BITS 64 /* allow selection of large files */ #include <stdio.h> diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index 6531bd27..dca4384b 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index e5f79abd..a52aa9d4 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> @@ -498,10 +498,6 @@ fe_set_title (session *sess) static gboolean mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata) { - prefs.hex_gui_win_state = 0; - if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) - prefs.hex_gui_win_state = 1; - if ((event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) && (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) && prefs.hex_gui_tray_minimize && !hextray_mode ()) @@ -510,6 +506,10 @@ mg_windowstate_cb (GtkWindow *wid, GdkEventWindowState *event, gpointer userdata gtk_window_deiconify (wid); } + prefs.hex_gui_win_state = 0; + if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) + prefs.hex_gui_win_state = 1; + return FALSE; } diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 3daf42c8..6fd62509 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index 7daf2484..0559734c 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/palette.c b/src/fe-gtk/palette.c index cd01c097..7507cbf4 100644 --- a/src/fe-gtk/palette.c +++ b/src/fe-gtk/palette.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index e0e0a149..419ef4c1 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 07207a99..294920da 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -372,6 +372,7 @@ tray_toggle_visibility (gboolean force_hide) { static int x, y; static GdkScreen *screen; + static int maximized; GtkWindow *win; if (!sticon) @@ -396,12 +397,15 @@ tray_toggle_visibility (gboolean force_hide) { gtk_window_get_position (win, &x, &y); screen = gtk_window_get_screen (win); + maximized = prefs.hex_gui_win_state; gtk_widget_hide (GTK_WIDGET (win)); } else { gtk_window_set_screen (win, screen); gtk_window_move (win, x, y); + if (maximized) + gtk_window_maximize (win); gtk_widget_show (GTK_WIDGET (win)); gtk_window_present (win); } diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index f10e439c..436accef 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index e37b3ba0..6764034f 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index e0839f79..41a1a642 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/sexy-iso-codes.c b/src/fe-gtk/sexy-iso-codes.c index 1e963cc1..9dc20105 100644 --- a/src/fe-gtk/sexy-iso-codes.c +++ b/src/fe-gtk/sexy-iso-codes.c @@ -18,9 +18,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, USA. - * + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef WIN32 diff --git a/src/fe-gtk/sexy-iso-codes.h b/src/fe-gtk/sexy-iso-codes.h index e5f37162..771c8eb0 100644 --- a/src/fe-gtk/sexy-iso-codes.h +++ b/src/fe-gtk/sexy-iso-codes.h @@ -18,9 +18,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, USA. - * + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef GTKSPELL_ISO_CODES_H diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 4dabc28a..48a6c383 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -16,8 +16,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, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/src/fe-gtk/sexy-spell-entry.h b/src/fe-gtk/sexy-spell-entry.h index 61d1b795..23f01af5 100644 --- a/src/fe-gtk/sexy-spell-entry.h +++ b/src/fe-gtk/sexy-spell-entry.h @@ -15,8 +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, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _SEXY_SPELL_ENTRY_H_ #define _SEXY_SPELL_ENTRY_H_ diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c index 7d4c38bd..7e006e69 100644 --- a/src/fe-gtk/textgui.c +++ b/src/fe-gtk/textgui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 89ea374f..b8a40a35 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index 89ddd49b..8405695b 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.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 St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 611bf090..e8419b5a 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.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 St, Fifth Floor, Boston, MA 02110-1301, USA * ========================================================================= * * xtext, the text widget used by X-Chat. |