diff options
author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-05-02 18:55:10 (GMT) |
---|---|---|
committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-05-02 18:55:10 (GMT) |
commit | c9c1e2212e37fb03d5e4ce4192cfe3f8a7515c5c (patch) | |
tree | 822213156a34cfbce9fe9af770e04e6ad6695a21 /shell | |
parent | 70693deccf54d178c25d7f89c1b2d4a51fa5316f (diff) |
Evince use it's own icon. Fix for the bug #313392.
* data/Makefile.am:
* data/evince.png:
* data/evince-16.png:
* data/evince-22.png:
* data/evince.svg:
* shell/main.c: (main):
Evince use it's own icon. Fix for the bug #313392.
* shell/ev-window.c: (fullscreen_timeout_cb),
(fullscreen_set_timeout), (fullscreen_clear_timeout),
(ev_window_cmd_help_about), (ev_window_dispose):
Simplify fullscreen timeout code.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ev-window.c | 36 | ||||
-rw-r--r-- | shell/main.c | 2 |
2 files changed, 16 insertions, 22 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index 71cf0ec..6ca0de6 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -127,7 +127,7 @@ struct _EvWindowPrivate { /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; GtkWidget *fullscreen_popup; - GSource *fullscreen_timeout_source; + guint fullscreen_timeout_id; /* Popup link */ GtkWidget *view_popup; @@ -1563,8 +1563,8 @@ fullscreen_timeout_cb (gpointer data) g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL); ev_view_hide_cursor (EV_VIEW (window->priv->view)); - g_source_unref (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + + window->priv->fullscreen_timeout_id = 0; return FALSE; } @@ -1572,28 +1572,22 @@ fullscreen_timeout_cb (gpointer data) static void fullscreen_set_timeout (EvWindow *window) { - GSource *source; - - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - - source = g_timeout_source_new (FULLSCREEN_TIMEOUT); - g_source_set_callback (source, fullscreen_timeout_cb, window, NULL); - g_source_attach (source, NULL); - window->priv->fullscreen_timeout_source = source; + + window->priv->fullscreen_timeout_id = + g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window); } static void fullscreen_clear_timeout (EvWindow *window) { - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - window->priv->fullscreen_timeout_source = NULL; + window->priv->fullscreen_timeout_id = 0; ev_view_show_cursor (EV_VIEW (window->priv->view)); } @@ -2428,6 +2422,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), + "logo-icon-name", "evince", NULL); g_free (comments); @@ -2809,10 +2804,9 @@ ev_window_dispose (GObject *object) priv->uri = NULL; } - if (window->priv->fullscreen_timeout_source) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + if (priv->fullscreen_timeout_id) { + g_source_remove (priv->fullscreen_timeout_id); + priv->fullscreen_timeout_id = 0; } destroy_fullscreen_popup (window); diff --git a/shell/main.c b/shell/main.c index 3a24e05..b874b28 100644 --- a/shell/main.c +++ b/shell/main.c @@ -288,7 +288,7 @@ main (int argc, char *argv[]) ev_file_helpers_init (); ev_debug_init (); ev_stock_icons_init (); - gtk_window_set_default_icon_name ("postscript-viewer"); + gtk_window_set_default_icon_name ("evince"); load_files (poptGetArgs (context)); |