callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/display/gimpdisplayshell-icon.[ch] moved more icon code to its new

Browse Source 
2008-03-26  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell-icon.[ch]
	* app/display/gimpdisplayshell-handlers.c: moved more icon code to
	its new home.

svn path=/trunk/; revision=25233
This commit is contained in:
Sven Neumann
2008-03-26 09:35:14 +00:00
committed by Sven Neumann
parent 973db9b6a0
commit a1b342d8a0
4 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-26 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-icon.[ch]
* app/display/gimpdisplayshell-handlers.c: moved more icon code to
its new home.
2008-03-25 Mukund Sivaraman <muks@mukund.org> 2008-03-25 Mukund Sivaraman <muks@mukund.org>
* plug-ins/common/mng.c: Cleaned up the rest of the plug-in. * plug-ins/common/mng.c: Cleaned up the rest of the plug-in.

32
app/display/gimpdisplayshell-handlers.c
View File

@ -47,9 +47,6 @@
#include "gimpdisplayshell-title.h" #include "gimpdisplayshell-title.h"
#define GIMP_DISPLAY_UPDATE_ICON_TIMEOUT 1000
/* local function prototypes */ /* local function prototypes */
static void gimp_display_shell_clean_dirty_handler (GimpImage *image, static void gimp_display_shell_clean_dirty_handler (GimpImage *image,
@ -119,8 +116,6 @@ static void gimp_display_shell_quality_notify_handler (GObject *c
GParamSpec *param_spec, GParamSpec *param_spec,
GimpDisplayShell *shell); GimpDisplayShell *shell);
static gboolean gimp_display_shell_idle_update_icon (gpointer data);
/* public functions */ /* public functions */
@ -271,11 +266,7 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
image = shell->display->image; image = shell->display->image;
if (shell->icon_idle_id) gimp_display_shell_icon_idle_stop (shell);
{
g_source_remove (shell->icon_idle_id);
shell->icon_idle_id = 0;
}
if (shell->grid_gc) if (shell->grid_gc)
{ {
@ -491,14 +482,7 @@ static void
gimp_display_shell_invalidate_preview_handler (GimpImage *image, gimp_display_shell_invalidate_preview_handler (GimpImage *image,
GimpDisplayShell *shell) GimpDisplayShell *shell)
{ {
if (shell->icon_idle_id) gimp_display_shell_icon_idle_update (shell);
g_source_remove (shell->icon_idle_id);
shell->icon_idle_id = g_timeout_add_full (G_PRIORITY_LOW,
GIMP_DISPLAY_UPDATE_ICON_TIMEOUT,
gimp_display_shell_idle_update_icon,
shell,
NULL);
} }
static void static void
@ -687,15 +671,3 @@ gimp_display_shell_quality_notify_handler (GObject *config,
{ {
gimp_display_shell_expose_full (shell); gimp_display_shell_expose_full (shell);
} }
static gboolean
gimp_display_shell_idle_update_icon (gpointer data)
{
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
shell->icon_idle_id = 0;
gimp_display_shell_icon_update (shell);
return FALSE;
}

43
app/display/gimpdisplayshell-icon.c
View File

@ -31,6 +31,11 @@
#include "gimpdisplayshell-icon.h" #include "gimpdisplayshell-icon.h"
#define GIMP_DISPLAY_UPDATE_ICON_TIMEOUT 1000
static gboolean gimp_display_shell_idle_update_icon (gpointer data);
void void
gimp_display_shell_icon_update (GimpDisplayShell *shell) gimp_display_shell_icon_update (GimpDisplayShell *shell)
{ {
@ -72,3 +77,41 @@ gimp_display_shell_icon_update (GimpDisplayShell *shell)
} }
} }
void
gimp_display_shell_icon_idle_update (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
if (shell->icon_idle_id)
g_source_remove (shell->icon_idle_id);
shell->icon_idle_id = g_timeout_add_full (G_PRIORITY_LOW,
GIMP_DISPLAY_UPDATE_ICON_TIMEOUT,
gimp_display_shell_idle_update_icon,
shell,
NULL);
}
void
gimp_display_shell_icon_idle_stop (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
if (shell->icon_idle_id)
{
g_source_remove (shell->icon_idle_id);
shell->icon_idle_id = 0;
}
}
static gboolean
gimp_display_shell_idle_update_icon (gpointer data)
{
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
shell->icon_idle_id = 0;
gimp_display_shell_icon_update (shell);
return FALSE;
}

4
app/display/gimpdisplayshell-icon.h
View File

@ -20,7 +20,9 @@
#define __GIMP_DISPLAY_SHELL_ICON_H__ #define __GIMP_DISPLAY_SHELL_ICON_H__
void gimp_display_shell_icon_update (GimpDisplayShell *shell); void gimp_display_shell_icon_update (GimpDisplayShell *shell);
void gimp_display_shell_icon_idle_update (GimpDisplayShell *shell);
void gimp_display_shell_icon_idle_stop (GimpDisplayShell *shell);
#endif /* __GIMP_DISPLAY_SHELL_ICON_H__ */ #endif /* __GIMP_DISPLAY_SHELL_ICON_H__ */