gimp r25233 - in trunk: . app/display
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25233 - in trunk: . app/display
- Date: Wed, 26 Mar 2008 09:35:15 +0000 (GMT)
Author: neo
Date: Wed Mar 26 09:35:14 2008
New Revision: 25233
URL: http://svn.gnome.org/viewvc/gimp?rev=25233&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/app/display/gimpdisplayshell-handlers.c
trunk/app/display/gimpdisplayshell-icon.c
trunk/app/display/gimpdisplayshell-icon.h
Modified: trunk/app/display/gimpdisplayshell-handlers.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-handlers.c (original)
+++ trunk/app/display/gimpdisplayshell-handlers.c Wed Mar 26 09:35:14 2008
@@ -47,9 +47,6 @@
#include "gimpdisplayshell-title.h"
-#define GIMP_DISPLAY_UPDATE_ICON_TIMEOUT 1000
-
-
/* local function prototypes */
static void gimp_display_shell_clean_dirty_handler (GimpImage *image,
@@ -119,8 +116,6 @@
GParamSpec *param_spec,
GimpDisplayShell *shell);
-static gboolean gimp_display_shell_idle_update_icon (gpointer data);
-
/* public functions */
@@ -271,11 +266,7 @@
image = shell->display->image;
- if (shell->icon_idle_id)
- {
- g_source_remove (shell->icon_idle_id);
- shell->icon_idle_id = 0;
- }
+ gimp_display_shell_icon_idle_stop (shell);
if (shell->grid_gc)
{
@@ -491,14 +482,7 @@
gimp_display_shell_invalidate_preview_handler (GimpImage *image,
GimpDisplayShell *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);
+ gimp_display_shell_icon_idle_update (shell);
}
static void
@@ -687,15 +671,3 @@
{
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;
-}
Modified: trunk/app/display/gimpdisplayshell-icon.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-icon.c (original)
+++ trunk/app/display/gimpdisplayshell-icon.c Wed Mar 26 09:35:14 2008
@@ -31,6 +31,11 @@
#include "gimpdisplayshell-icon.h"
+#define GIMP_DISPLAY_UPDATE_ICON_TIMEOUT 1000
+
+static gboolean gimp_display_shell_idle_update_icon (gpointer data);
+
+
void
gimp_display_shell_icon_update (GimpDisplayShell *shell)
{
@@ -72,3 +77,41 @@
}
}
+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;
+}
Modified: trunk/app/display/gimpdisplayshell-icon.h
==============================================================================
--- trunk/app/display/gimpdisplayshell-icon.h (original)
+++ trunk/app/display/gimpdisplayshell-icon.h Wed Mar 26 09:35:14 2008
@@ -20,7 +20,9 @@
#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__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]