gegl r2029 - in trunk: . bin

[martinn svn gnome org]

Author: martinn
Date: Sat Feb 16 23:07:29 2008
New Revision: 2029
URL: http://svn.gnome.org/viewvc/gegl?rev=2029&view=rev

Log:
2008-02-17  Martin Nordholts  <martinn svn gnome org>

	* bin/editor-optype.c: General cleanup and added static function
	proptotypes.


Modified:
   trunk/ChangeLog
   trunk/bin/editor-optype.c

Modified: trunk/bin/editor-optype.c
==============================================================================
--- trunk/bin/editor-optype.c	(original)
+++ trunk/bin/editor-optype.c	Sat Feb 16 23:07:29 2008
@@ -16,25 +16,45 @@
  * Copyright (C) 2003, 2004, 2006 Ãyvind KolÃs
  */
 
-#include <gtk/gtk.h>
-#include "gegl-plugin.h"  /* FIXME: should just be gegl.h */
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
+
+#include <gtk/gtk.h>
+
+#include "gegl-plugin.h"  /* FIXME: should just be gegl.h */
+
 #include "editor.h"
 #include "gegl-tree-editor.h"
 #include "gegl-node-editor.h"
 #include "gegl-tree-editor-action.h"
 
 
-extern GeglNode *editor_output;
-
-
-static void     entry_activate            (GtkEntry           *entry,
-                                           gpointer            user_data);
-static gboolean completion_match_selected (GtkEntryCompletion *completion,
-                                           GtkTreeModel       *model,
-                                           GtkTreeIter        *iter,
-                                           gpointer            user_data);
+static void           popup_properties                       (GeglNode           *node);
+static void           chain_in_operation                     (const gchar        *op_type);
+static void           menu_item_activate                     (GtkWidget          *widget,
+                                                              gpointer            user_data);
+static void           operation_class_iterate_for_completion (GType               type,
+                                                              GtkListStore       *store);
+static GtkTreeModel * create_completion_model                (GeglNode           *item);
+static void           operation_class_iterate_for_menu       (GType               type,
+                                                              GtkWidget          *menu,
+                                                              GeglNode           *item);
+static GtkWidget *    optype_menu                            (GeglNode           *item);
+static void           gtk_option_menu_position               (GtkMenu            *menu,
+                                                              gint               *x,
+                                                              gint               *y,
+                                                              gboolean           *push_in,
+                                                              gpointer            user_data);
+static void           button_clicked                         (GtkButton          *button,
+                                                              gpointer            item);
+static void           entry_activate                         (GtkEntry           *entry,
+                                                              gpointer            user_data);
+static gboolean       completion_match_selected              (GtkEntryCompletion *completion,
+                                                              GtkTreeModel       *model,
+                                                              GtkTreeIter        *iter,
+                                                              gpointer            user_data);
 
 
 static void popup_properties (GeglNode *node)
@@ -87,9 +107,9 @@
   popup_properties (new);
 }
 
-
 static void
-menu_item_activate (GtkWidget *widget, gpointer user_data)
+menu_item_activate (GtkWidget *widget,
+                    gpointer   user_data)
 {
   GtkWidget *menu_item;
   GtkWidget *label;
@@ -125,7 +145,7 @@
     }
 #if 0
 
-  item = user_data;
+  item     = user_data;
   old_type = oxide_get_property (item, "type");
   old_name = oxide_get_property (item, "name");
   oxide_set_property (item, "type", new_type);
@@ -146,7 +166,7 @@
 }
 
 static void
-operation_class_iterate_for_completion (GType type,
+operation_class_iterate_for_completion (GType         type,
                                         GtkListStore *store)
 {
   GType *ops;
@@ -200,7 +220,7 @@
     return;
   ops = g_type_children (type, &children);
 
-  for (no=0; no<children; no++)
+  for (no = 0; no <children; no++)
     {
       GeglOperationClass *klass;
 
@@ -472,7 +492,8 @@
 }
 
 static void
-entry_activate (GtkEntry * entry, gpointer user_data)
+entry_activate (GtkEntry *entry,
+                gpointer  user_data)
 {
   GeglNode   *item = user_data;
   const char *new_type = gtk_entry_get_text (entry);