aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/text')
-rw-r--r--widgets/text/a11y/gal-a11y-e-text-factory.c2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text-factory.h2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text.c2
-rw-r--r--widgets/text/a11y/gal-a11y-e-text.h2
-rw-r--r--widgets/text/e-reflow-model.c2
-rw-r--r--widgets/text/e-reflow-model.h2
-rw-r--r--widgets/text/e-reflow.c2
-rw-r--r--widgets/text/e-reflow.h2
-rw-r--r--widgets/text/e-text-model-repos.c2
-rw-r--r--widgets/text/e-text-model-repos.h2
-rw-r--r--widgets/text/e-text-model.c4
-rw-r--r--widgets/text/e-text-model.h2
-rw-r--r--widgets/text/e-text.c20
-rw-r--r--widgets/text/e-text.h2
14 files changed, 23 insertions, 25 deletions
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.c b/widgets/text/a11y/gal-a11y-e-text-factory.c
index e1f835e912..2df9241014 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.c
+++ b/widgets/text/a11y/gal-a11y-e-text-factory.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.h b/widgets/text/a11y/gal-a11y-e-text-factory.h
index ce4d4d0a65..df7638f64f 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.h
+++ b/widgets/text/a11y/gal-a11y-e-text-factory.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/a11y/gal-a11y-e-text.c
index 4eeb7811fc..98484949ff 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/a11y/gal-a11y-e-text.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/a11y/gal-a11y-e-text.h b/widgets/text/a11y/gal-a11y-e-text.h
index 5cebd0ff83..6a5bb80de0 100644
--- a/widgets/text/a11y/gal-a11y-e-text.h
+++ b/widgets/text/a11y/gal-a11y-e-text.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-reflow-model.c b/widgets/text/e-reflow-model.c
index eae3d43324..d24b915e6e 100644
--- a/widgets/text/e-reflow-model.c
+++ b/widgets/text/e-reflow-model.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-reflow-model.h b/widgets/text/e-reflow-model.h
index 7482e5079f..c772621d07 100644
--- a/widgets/text/e-reflow-model.h
+++ b/widgets/text/e-reflow-model.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index c17b970a23..95f3f89bab 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-reflow.h b/widgets/text/e-reflow.h
index afdc9edb67..3ea840d358 100644
--- a/widgets/text/e-reflow.h
+++ b/widgets/text/e-reflow.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
index 0b55930792..ef31f91def 100644
--- a/widgets/text/e-text-model-repos.c
+++ b/widgets/text/e-text-model-repos.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
index 461a70f59d..6a185daa08 100644
--- a/widgets/text/e-text-model-repos.h
+++ b/widgets/text/e-text-model-repos.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 207ac6ce50..c7462e21a6 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -48,8 +48,6 @@ struct _ETextModelPrivate {
GString *text;
};
-static void e_text_model_class_init (ETextModelClass *class);
-static void e_text_model_init (ETextModel *model);
static void e_text_model_dispose (GObject *object);
static gint e_text_model_real_validate_position (ETextModel *, gint pos);
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 2a484f14b4..69c6f0c68e 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 3ce0065210..b30cf05b0c 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -386,10 +386,10 @@ reset_layout_attrs (EText *text)
}
pango_layout_set_attributes (text->layout, attrs);
-
+
if (attrs)
pango_attr_list_unref (attrs);
-
+
calc_height (text);
}
@@ -1514,12 +1514,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
}
}
- /* Insert preedit text only when im_context signals are connected &
+ /* Insert preedit text only when im_context signals are connected &
* text->preedit_len is not zero */
if (text->im_context_signals_registered && text->preedit_len)
insert_preedit_text (text);
- /* Need to reset the layout to cleanly clear the preedit buffer when
+ /* Need to reset the layout to cleanly clear the preedit buffer when
* typing in CJK & using backspace on the preedit */
if(!text->preedit_len)
reset_layout (text);
@@ -2350,7 +2350,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
if (e_tep_event.key.string)
- g_free (e_tep_event.key.string);
+ g_free ((gpointer) e_tep_event.key.string);
return ret;
@@ -2603,11 +2603,11 @@ static void
e_text_update_primary_selection (EText *text)
{
static const GtkTargetEntry targets[] = {
- { "UTF8_STRING", 0, 0 },
- { "UTF-8", 0, 0 },
- { "STRING", 0, 0 },
- { "TEXT", 0, 0 },
- { "COMPOUND_TEXT", 0, 0 }
+ { (gchar *) "UTF8_STRING", 0, 0 },
+ { (gchar *) "UTF-8", 0, 0 },
+ { (gchar *) "STRING", 0, 0 },
+ { (gchar *) "TEXT", 0, 0 },
+ { (gchar *) "COMPOUND_TEXT", 0, 0 }
};
GtkClipboard *clipboard;
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index a426b2c64f..ebe5817285 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors: