gimp r27424 - in trunk: . app/actions app/tools

[mitch svn gnome org]

Author: mitch
Date: Sun Oct 26 20:05:11 2008
New Revision: 27424
URL: http://svn.gnome.org/viewvc/gimp?rev=27424&view=rev

Log:
2008-10-26  Michael Natterer  <mitch gimp org>

	* app/tools/gimptexttool.c: some formatting cleanup.

	* app/tools/gimprectangletool.c: add one space.

	* app/actions/text-tool-actions.c: look at GDK_SELECTION_CLIPBOARD,
	not PRIMARY, to set the sensitivity of "Paste".



Modified:
   trunk/ChangeLog
   trunk/app/actions/text-tool-actions.c
   trunk/app/tools/gimprectangletool.c
   trunk/app/tools/gimptexttool.c

Modified: trunk/app/actions/text-tool-actions.c
==============================================================================
--- trunk/app/actions/text-tool-actions.c	(original)
+++ trunk/app/actions/text-tool-actions.c	Sun Oct 26 20:05:11 2008
@@ -152,7 +152,7 @@
    * see whether there is text available for pasting
    */
   clipboard = gtk_widget_get_clipboard (GIMP_TOOL (text_tool)->display->shell,
-                                        GDK_SELECTION_PRIMARY);
+                                        GDK_SELECTION_CLIPBOARD);
   clip = gtk_clipboard_wait_is_text_available (clipboard);
 
 #define SET_VISIBLE(action,condition) \

Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c	(original)
+++ trunk/app/tools/gimprectangletool.c	Sun Oct 26 20:05:11 2008
@@ -905,7 +905,7 @@
 
       gimp_rectangle_tool_update_handle_sizes (rect_tool);
 
-      /* Created rectangles should not be started in narrow-mode*/
+      /* Created rectangles should not be started in narrow-mode */
       private->narrow_mode = FALSE;
 
       /* If the rectangle is being modified we want the center on

Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c	(original)
+++ trunk/app/tools/gimptexttool.c	Sun Oct 26 20:05:11 2008
@@ -579,9 +579,9 @@
                                GimpButtonReleaseType  release_type,
                                GimpDisplay           *display)
 {
-  GimpRectangleTool *rect_tool      = GIMP_RECTANGLE_TOOL (tool);
-  GimpTextTool      *text_tool      = GIMP_TEXT_TOOL (tool);
-  GimpText          *text           = text_tool->text;
+  GimpRectangleTool *rect_tool = GIMP_RECTANGLE_TOOL (tool);
+  GimpTextTool      *text_tool = GIMP_TEXT_TOOL (tool);
+  GimpText          *text      = text_tool->text;
   gint               x1, y1, x2, y2;
 
   g_object_get (text_tool,
@@ -2310,12 +2310,10 @@
   GimpTool     *tool = GIMP_TOOL (text_tool);
   GtkClipboard *clipboard;
 
-  if (use_clipboard)
-    clipboard = gtk_widget_get_clipboard (tool->display->shell,
-                                          GDK_SELECTION_CLIPBOARD);
-  else
-    clipboard = gtk_widget_get_clipboard (tool->display->shell,
-                                          GDK_SELECTION_PRIMARY);
+  clipboard = gtk_widget_get_clipboard (tool->display->shell,
+                                        use_clipboard ?
+                                        GDK_SELECTION_CLIPBOARD :
+                                        GDK_SELECTION_PRIMARY);
 
   gtk_text_buffer_copy_clipboard (text_tool->text_buffer, clipboard);
 }
@@ -2327,12 +2325,10 @@
   GimpTool     *tool = GIMP_TOOL (text_tool);
   GtkClipboard *clipboard;
 
-  if (use_clipboard)
-    clipboard = gtk_widget_get_clipboard (tool->display->shell,
-                                          GDK_SELECTION_CLIPBOARD);
-  else
-    clipboard = gtk_widget_get_clipboard (tool->display->shell,
-                                          GDK_SELECTION_PRIMARY);
+  clipboard = gtk_widget_get_clipboard (tool->display->shell,
+                                        use_clipboard ?
+                                        GDK_SELECTION_CLIPBOARD :
+                                        GDK_SELECTION_PRIMARY);
 
   gtk_text_buffer_paste_clipboard (text_tool->text_buffer, clipboard, NULL, TRUE);
 }