gimp r25612 - in trunk: . plug-ins/common

[mitch svn gnome org]

Author: mitch
Date: Sat May 10 10:42:18 2008
New Revision: 25612
URL: http://svn.gnome.org/viewvc/gimp?rev=25612&view=rev

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

	* plug-ins/common/gtm.c: renamed...

	* plug-ins/common/html-table.c: ...to this and cleaned it up.

	* plugin-defs.pl: changed accordingly.
	* Makefile.am: regenerated.



Added:
   trunk/plug-ins/common/html-table.c
      - copied, changed from r25607, /trunk/plug-ins/common/gtm.c
Removed:
   trunk/plug-ins/common/gtm.c
Modified:
   trunk/ChangeLog
   trunk/plug-ins/common/   (props changed)
   trunk/plug-ins/common/Makefile.am
   trunk/plug-ins/common/plugin-defs.pl

Modified: trunk/plug-ins/common/Makefile.am
==============================================================================
--- trunk/plug-ins/common/Makefile.am	(original)
+++ trunk/plug-ins/common/Makefile.am	Sat May 10 10:42:18 2008
@@ -101,10 +101,10 @@
 	glob \
 	gradient-map \
 	grid \
-	gtm \
 	guillotine \
 	header \
 	hot \
+	html-table \
 	illusion \
 	iwarp \
 	jigsaw \
@@ -1210,22 +1210,6 @@
 	$(RT_LIBS)		\
 	$(INTLLIBS)
 
-gtm_SOURCES = \
-	gtm.c
-
-gtm_LDADD = \
-	$(libgimpui)		\
-	$(libgimpwidgets)	\
-	$(libgimpmodule)	\
-	$(libgimp)		\
-	$(libgimpmath)		\
-	$(libgimpconfig)	\
-	$(libgimpcolor)		\
-	$(libgimpbase)		\
-	$(GTK_LIBS)		\
-	$(RT_LIBS)		\
-	$(INTLLIBS)
-
 guillotine_SOURCES = \
 	guillotine.c
 
@@ -1271,6 +1255,22 @@
 	$(RT_LIBS)		\
 	$(INTLLIBS)
 
+html_table_SOURCES = \
+	html-table.c
+
+html_table_LDADD = \
+	$(libgimpui)		\
+	$(libgimpwidgets)	\
+	$(libgimpmodule)	\
+	$(libgimp)		\
+	$(libgimpmath)		\
+	$(libgimpconfig)	\
+	$(libgimpcolor)		\
+	$(libgimpbase)		\
+	$(GTK_LIBS)		\
+	$(RT_LIBS)		\
+	$(INTLLIBS)
+
 illusion_SOURCES = \
 	illusion.c
 

Copied: trunk/plug-ins/common/html-table.c (from r25607, /trunk/plug-ins/common/gtm.c)
==============================================================================
--- /trunk/plug-ins/common/gtm.c	(original)
+++ trunk/plug-ins/common/html-table.c	Sat May 10 10:42:18 2008
@@ -62,23 +62,23 @@
 
 
 #define SAVE_PROC      "file-gtm-save"
-#define PLUG_IN_BINARY "gtm"
+#define PLUG_IN_BINARY "html-table"
 
 /* Typedefs */
 
 typedef struct
 {
-  gchar captiontxt[256];
-  gchar cellcontent[256];
-  gchar clwidth[256];
-  gchar clheight[256];
-  gint  fulldoc;
-  gint  caption;
-  gint  border;
-  gint  spantags;
-  gint  tdcomp;
-  gint  cellpadding;
-  gint  cellspacing;
+  gchar    captiontxt[256];
+  gchar    cellcontent[256];
+  gchar    clwidth[256];
+  gchar    clheight[256];
+  gboolean fulldoc;
+  gboolean caption;
+  gint     border;
+  gboolean spantags;
+  gboolean tdcomp;
+  gint     cellpadding;
+  gint     cellspacing;
 } GTMValues;
 
 /* Variables */
@@ -87,40 +87,40 @@
 {
   "Made with GIMP Table Magic",  /* caption text */
   "&nbsp;",  /* cellcontent text */
-  "",    /* cell width text */
-  "",    /* cell height text */
-  1,     /* fulldoc */
-  0,     /* caption */
-  2,     /* border */
-  0,     /* spantags */
-  0,     /* tdcomp */
-  4,     /* cellpadding */
-  0      /* cellspacing */
+  "",        /* cell width text */
+  "",        /* cell height text */
+  TRUE,      /* fulldoc */
+  FALSE,     /* caption */
+  2,         /* border */
+  FALSE,     /* spantags */
+  FALSE,     /* tdcomp */
+  4,         /* cellpadding */
+  0          /* cellspacing */
 };
 
 /* Declare some local functions */
 
-static void   query      (void);
-static void   run        (const gchar      *name,
-                          gint              nparams,
-                          const GimpParam  *param,
-                          gint             *nreturn_vals,
-                          GimpParam       **return_vals);
-
-static gboolean save_image          (const gchar  *filename,
-                                     GimpDrawable *drawable);
-static gboolean save_dialog         (gint32        image_ID);
-
-static gboolean color_comp             (guchar    *buffer,
-                                        guchar    *buf2);
-static void   gtm_caption_callback     (GtkWidget *widget,
-                                        gpointer   data);
-static void   gtm_cellcontent_callback (GtkWidget *widget,
-                                        gpointer   data);
-static void   gtm_clwidth_callback     (GtkWidget *widget,
-                                        gpointer   data);
-static void   gtm_clheight_callback    (GtkWidget *widget,
-                                        gpointer   data);
+static void     query                    (void);
+static void     run                      (const gchar      *name,
+                                          gint              nparams,
+                                          const GimpParam  *param,
+                                          gint             *nreturn_vals,
+                                          GimpParam       **return_vals);
+
+static gboolean save_image               (const gchar      *filename,
+                                          GimpDrawable     *drawable);
+static gboolean save_dialog              (gint32            image_ID);
+
+static gboolean color_comp               (guchar           *buffer,
+                                          guchar           *buf2);
+static void     gtm_caption_callback     (GtkWidget        *widget,
+                                          gpointer          data);
+static void     gtm_cellcontent_callback (GtkWidget        *widget,
+                                          gpointer          data);
+static void     gtm_clwidth_callback     (GtkWidget        *widget,
+                                          gpointer          data);
+static void     gtm_clheight_callback    (GtkWidget        *widget,
+                                          gpointer          data);
 
 
 const GimpPlugInInfo PLUG_IN_INFO =
@@ -265,10 +265,10 @@
     {
       height = g_strdup_printf (" HEIGHT=\"%s\" ", gtmvals.clheight);
     }
-  
+
   if (! width)
     width = g_strdup (" ");
-  
+
   if (! height)
     height = g_strdup (" ");
 
@@ -651,7 +651,9 @@
 color_comp (guchar *buffer,
 	    guchar *buf2)
 {
-  return buffer[0] == buf2[0] && buffer[1] == buf2[1] && buffer[2] == buf2[2];
+  return (buffer[0] == buf2[0] &&
+          buffer[1] == buf2[1] &&
+          buffer[2] == buf2[2]);
 }
 
 /*  Save interface functions  */

Modified: trunk/plug-ins/common/plugin-defs.pl
==============================================================================
--- trunk/plug-ins/common/plugin-defs.pl	(original)
+++ trunk/plug-ins/common/plugin-defs.pl	Sat May 10 10:42:18 2008
@@ -64,10 +64,10 @@
     'glob' => {},
     'gradient-map' => {},
     'grid' => { ui => 1 },
-    'gtm' => { ui => 1 },
     'guillotine' => {},
     'header' => { ui => 1 },
     'hot' => { ui => 1 },
+    'html-table' => { ui => 1 },
     'illusion' => { ui => 1 },
     'iwarp' => { ui => 1 },
     'jigsaw' => { ui => 1 },