[gnome-color-manager] trivial: rename GcmCellRendererProfile to GcmCellRendererProfileText
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: rename GcmCellRendererProfile to GcmCellRendererProfileText
- Date: Sat, 9 Oct 2010 20:35:04 +0000 (UTC)
commit e5a5c32449a137b90a5473cb56450839c29ce1e4
Author: Richard Hughes <richard hughsie com>
Date: Sat Oct 9 21:11:06 2010 +0100
trivial: rename GcmCellRendererProfile to GcmCellRendererProfileText
src/Makefile.am | 8 +-
src/cc-color-panel.c | 4 +-
...-profile.c => gcm-cell-renderer-profile-text.c} | 34 ++++++------
src/gcm-cell-renderer-profile-text.h | 61 ++++++++++++++++++++
src/gcm-cell-renderer-profile.h | 61 --------------------
src/gcm-viewer.c | 4 +-
6 files changed, 86 insertions(+), 86 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 41f73e2..6624114 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,8 +168,8 @@ gcm_import_CFLAGS = \
$(WARNINGFLAGS_C)
gcm_viewer_SOURCES = \
- gcm-cell-renderer-profile.c \
- gcm-cell-renderer-profile.h \
+ gcm-cell-renderer-profile-text.c \
+ gcm-cell-renderer-profile-text.h \
gcm-viewer.c
gcm_viewer_LDADD = \
@@ -236,8 +236,8 @@ gcm_session_CFLAGS = \
libcolor_la_SOURCES = \
cc-color-panel.c \
cc-color-panel.h \
- gcm-cell-renderer-profile.c \
- gcm-cell-renderer-profile.h \
+ gcm-cell-renderer-profile-text.c \
+ gcm-cell-renderer-profile-text.h \
$(libgcmshared_a_SOURCES) \
$(NULL)
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 0989450..d70f275 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -31,7 +31,7 @@
#include "egg-debug.h"
-#include "gcm-cell-renderer-profile.h"
+#include "gcm-cell-renderer-profile-text.h"
#include "gcm-calibrate-argyll.h"
#include "gcm-cie-widget.h"
#include "gcm-client.h"
@@ -1406,7 +1406,7 @@ cc_color_panel_add_assign_columns (CcColorPanel *panel, GtkTreeView *treeview)
GtkTreeViewColumn *column;
/* column for text */
- renderer = gcm_cell_renderer_profile_new ();
+ renderer = gcm_cell_renderer_profile_text_new ();
g_object_set (renderer,
"wrap-mode", PANGO_WRAP_WORD,
NULL);
diff --git a/src/gcm-cell-renderer-profile.c b/src/gcm-cell-renderer-profile-text.c
similarity index 76%
rename from src/gcm-cell-renderer-profile.c
rename to src/gcm-cell-renderer-profile-text.c
index af5ac7b..45e3df2 100644
--- a/src/gcm-cell-renderer-profile.c
+++ b/src/gcm-cell-renderer-profile-text.c
@@ -27,7 +27,7 @@
#include "egg-debug.h"
-#include "gcm-cell-renderer-profile.h"
+#include "gcm-cell-renderer-profile-text.h"
enum {
PROP_0,
@@ -36,15 +36,15 @@ enum {
PROP_LAST
};
-G_DEFINE_TYPE (GcmCellRendererProfile, gcm_cell_renderer_profile, GTK_TYPE_CELL_RENDERER_TEXT)
+G_DEFINE_TYPE (GcmCellRendererProfileText, gcm_cell_renderer_profile_text, GTK_TYPE_CELL_RENDERER_TEXT)
static gpointer parent_class = NULL;
static void
-gcm_cell_renderer_profile_get_property (GObject *object, guint param_id,
+gcm_cell_renderer_profile_text_get_property (GObject *object, guint param_id,
GValue *value, GParamSpec *pspec)
{
- GcmCellRendererProfile *renderer = GCM_CELL_RENDERER_PROFILE (object);
+ GcmCellRendererProfileText *renderer = GCM_CELL_RENDERER_PROFILE_TEXT (object);
switch (param_id) {
case PROP_PROFILE:
@@ -60,7 +60,7 @@ gcm_cell_renderer_profile_get_property (GObject *object, guint param_id,
}
static void
-gcm_cell_renderer_set_markup (GcmCellRendererProfile *renderer)
+gcm_cell_renderer_set_markup (GcmCellRendererProfileText *renderer)
{
GString *string;
const gchar *description;
@@ -88,10 +88,10 @@ gcm_cell_renderer_set_markup (GcmCellRendererProfile *renderer)
}
static void
-gcm_cell_renderer_profile_set_property (GObject *object, guint param_id,
+gcm_cell_renderer_profile_text_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec)
{
- GcmCellRendererProfile *renderer = GCM_CELL_RENDERER_PROFILE (object);
+ GcmCellRendererProfileText *renderer = GCM_CELL_RENDERER_PROFILE_TEXT (object);
switch (param_id) {
case PROP_PROFILE:
@@ -117,8 +117,8 @@ gcm_cell_renderer_profile_set_property (GObject *object, guint param_id,
static void
gcm_cell_renderer_finalize (GObject *object)
{
- GcmCellRendererProfile *renderer;
- renderer = GCM_CELL_RENDERER_PROFILE (object);
+ GcmCellRendererProfileText *renderer;
+ renderer = GCM_CELL_RENDERER_PROFILE_TEXT (object);
g_free (renderer->markup);
if (renderer->profile != NULL)
g_object_unref (renderer->profile);
@@ -126,15 +126,15 @@ gcm_cell_renderer_finalize (GObject *object)
}
static void
-gcm_cell_renderer_profile_class_init (GcmCellRendererProfileClass *class)
+gcm_cell_renderer_profile_text_class_init (GcmCellRendererProfileTextClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->finalize = gcm_cell_renderer_finalize;
parent_class = g_type_class_peek_parent (class);
- object_class->get_property = gcm_cell_renderer_profile_get_property;
- object_class->set_property = gcm_cell_renderer_profile_set_property;
+ object_class->get_property = gcm_cell_renderer_profile_text_get_property;
+ object_class->set_property = gcm_cell_renderer_profile_text_set_property;
g_object_class_install_property (object_class, PROP_PROFILE,
g_param_spec_object ("profile", "PROFILE",
@@ -145,10 +145,10 @@ gcm_cell_renderer_profile_class_init (GcmCellRendererProfileClass *class)
}
/**
- * gcm_cell_renderer_profile_init:
+ * gcm_cell_renderer_profile_text_init:
**/
static void
-gcm_cell_renderer_profile_init (GcmCellRendererProfile *renderer)
+gcm_cell_renderer_profile_text_init (GcmCellRendererProfileText *renderer)
{
renderer->is_default = FALSE;
renderer->profile = NULL;
@@ -156,11 +156,11 @@ gcm_cell_renderer_profile_init (GcmCellRendererProfile *renderer)
}
/**
- * gcm_cell_renderer_profile_new:
+ * gcm_cell_renderer_profile_text_new:
**/
GtkCellRenderer *
-gcm_cell_renderer_profile_new (void)
+gcm_cell_renderer_profile_text_new (void)
{
- return g_object_new (GCM_TYPE_CELL_RENDERER_PROFILE, NULL);
+ return g_object_new (GCM_TYPE_CELL_RENDERER_PROFILE_TEXT, NULL);
}
diff --git a/src/gcm-cell-renderer-profile-text.h b/src/gcm-cell-renderer-profile-text.h
new file mode 100644
index 0000000..594cbba
--- /dev/null
+++ b/src/gcm-cell-renderer-profile-text.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef GCM_CELL_RENDERER_PROFILE_TEXT_H
+#define GCM_CELL_RENDERER_PROFILE_TEXT_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "gcm-profile.h"
+
+#define GCM_TYPE_CELL_RENDERER_PROFILE_TEXT (gcm_cell_renderer_profile_text_get_type())
+#define GCM_CELL_RENDERER_PROFILE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT, GcmCellRendererProfileText))
+#define GCM_CELL_RENDERER_PROFILE_TEXT_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT, GcmCellRendererProfileTextClass))
+#define GCM_IS_CELL_RENDERER_PROFILE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT))
+#define GCM_IS_CELL_RENDERER_PROFILE_TEXT_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT))
+#define GCM_CELL_RENDERER_PROFILE_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT, GcmCellRendererProfileTextClass))
+
+G_BEGIN_DECLS
+
+typedef struct _GcmCellRendererProfileText GcmCellRendererProfileText;
+typedef struct _GcmCellRendererProfileTextClass GcmCellRendererProfileTextClass;
+
+struct _GcmCellRendererProfileText
+{
+ GtkCellRendererText parent;
+ GcmProfile *profile;
+ gboolean is_default;
+ gchar *markup;
+};
+
+struct _GcmCellRendererProfileTextClass
+{
+ GtkCellRendererTextClass parent_class;
+};
+
+GType gcm_cell_renderer_profile_text_get_type (void);
+GtkCellRenderer *gcm_cell_renderer_profile_text_new (void);
+
+G_END_DECLS
+
+#endif /* GCM_CELL_RENDERER_PROFILE_TEXT_H */
+
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index 6c5d9db..00c764e 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -29,7 +29,7 @@
#include "egg-debug.h"
-#include "gcm-cell-renderer-profile.h"
+#include "gcm-cell-renderer-profile-text.h"
#include "gcm-calibrate-argyll.h"
#include "gcm-cie-widget.h"
#include "gcm-image.h"
@@ -517,7 +517,7 @@ gcm_viewer_add_profiles_columns (GcmViewerPrivate *viewer, GtkTreeView *treeview
gtk_widget_set_size_request (GTK_WIDGET (treeview), GCM_VIEWER_TREEVIEW_WIDTH, -1);
/* column for text */
- renderer = gcm_cell_renderer_profile_new ();
+ renderer = gcm_cell_renderer_profile_text_new ();
g_object_set (renderer,
"wrap-mode", PANGO_WRAP_WORD,
"wrap-width", GCM_VIEWER_TREEVIEW_WIDTH - 62,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]