[evolution/wip/webkit-composer: 523/966] Make the color combo slightly wider
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 523/966] Make the color combo slightly wider
- Date: Wed, 23 Apr 2014 10:37:23 +0000 (UTC)
commit a754a65d41730d27b5d84dd12282b4fb5fd71dc5
Author: Dan Vrátil <dvratil redhat com>
Date: Mon Jul 30 19:05:55 2012 +0200
Make the color combo slightly wider
e-util/e-color-combo.c | 330 ------------------------------------------------
1 files changed, 0 insertions(+), 330 deletions(-)
---
diff --git a/e-util/e-color-combo.c b/e-util/e-color-combo.c
index b1ba3d2..bfc8544 100644
--- a/e-util/e-color-combo.c
+++ b/e-util/e-color-combo.c
@@ -1,10 +1,5 @@
/* e-color-combo.c
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
* License as published by the Free Software Foundation.
@@ -32,37 +27,10 @@
#include <cairo/cairo.h>
#include <alloca.h>
-<<<<<<< HEAD
-#define E_COLOR_COMBO_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_COLOR_COMBO, EColorComboPrivate))
-
-struct _EColorComboPrivate {
- GtkWidget *color_frame; /* not referenced */
- GtkWidget *arrow; /* not referenced */
-
- GtkWidget *window;
- GtkWidget *default_button; /* not referenced */
- GtkWidget *chooser_widget; /* not referenced */
-
- guint popup_shown : 1;
- guint popup_in_progress : 1;
-
- GdkRGBA *current_color;
- GdkRGBA *default_color;
- gint default_transparent: 1;
-
- GList *palette;
-
- GdkDevice *grab_keyboard;
- GdkDevice *grab_mouse;
-};
-=======
G_DEFINE_TYPE (
EColorCombo,
e_color_combo,
GTK_TYPE_BUTTON);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
enum {
PROP_0,
@@ -81,8 +49,6 @@ enum {
LAST_SIGNAL
};
-<<<<<<< HEAD
-=======
struct _EColorComboPrivate {
GtkWidget *color_frame;
GtkWidget *arrow;
@@ -104,7 +70,6 @@ struct _EColorComboPrivate {
GdkDevice *grab_mouse;
};
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
static guint signals[LAST_SIGNAL];
static GdkRGBA black = { 0, 0, 0, 1 };
@@ -159,14 +124,6 @@ static struct {
{ "#FFFFFF", N_("white") }
};
-<<<<<<< HEAD
-G_DEFINE_TYPE (
- EColorCombo,
- e_color_combo,
- GTK_TYPE_BUTTON);
-
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
static void
color_combo_reposition_window (EColorCombo *combo)
{
@@ -235,25 +192,6 @@ color_combo_popup (EColorCombo *combo)
/* Try to grab the pointer and keyboard. */
window = gtk_widget_get_window (combo->priv->window);
-<<<<<<< HEAD
- grab_status =
- (keyboard == NULL) ||
- (gdk_device_grab (
- keyboard, window,
- GDK_OWNERSHIP_WINDOW, TRUE,
- GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
- NULL, activate_time) == GDK_GRAB_SUCCESS);
- if (grab_status) {
- grab_status =
- (mouse == NULL) ||
- (gdk_device_grab (
- mouse, window,
- GDK_OWNERSHIP_WINDOW, TRUE,
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK,
- NULL, activate_time) == GDK_GRAB_SUCCESS);
-=======
grab_status = !keyboard ||
gdk_device_grab (keyboard, window,
GDK_OWNERSHIP_WINDOW, TRUE,
@@ -265,7 +203,6 @@ color_combo_popup (EColorCombo *combo)
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
NULL, activate_time) == GDK_GRAB_SUCCESS;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
if (!grab_status && keyboard)
gdk_device_ungrab (keyboard, activate_time);
}
@@ -280,12 +217,7 @@ color_combo_popup (EColorCombo *combo)
/* Always make sure the editor-mode is OFF */
g_object_set (
-<<<<<<< HEAD
- G_OBJECT (combo->priv->chooser_widget),
- "show-editor", FALSE, NULL);
-=======
G_OBJECT (combo->priv->chooser_widget), "show-editor", FALSE, NULL);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
}
static void
@@ -312,13 +244,8 @@ color_combo_popdown (EColorCombo *combo)
static gboolean
color_combo_window_button_press_event_cb (EColorCombo *combo,
-<<<<<<< HEAD
- GdkEvent *event,
- gpointer user_data)
-=======
GdkEvent *event,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
GtkWidget *event_widget;
@@ -339,13 +266,8 @@ color_combo_window_button_press_event_cb (EColorCombo *combo,
static gboolean
color_combo_window_button_release_event_cb (EColorCombo *combo,
-<<<<<<< HEAD
- GdkEvent *event,
- gpointer user_data)
-=======
GdkEvent *event,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
gboolean popup_in_progress;
@@ -382,13 +304,8 @@ color_combo_child_hide_cb (EColorCombo *combo)
static void
color_combo_get_preferred_width (GtkWidget *widget,
-<<<<<<< HEAD
- gint *min_width,
- gint *natural_width)
-=======
gint *min_width,
gint *natural_width)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
GtkWidgetClass *widget_class;
@@ -397,26 +314,15 @@ color_combo_get_preferred_width (GtkWidget *widget,
/* Make sure the box with color sample is always visible */
if (min_width)
-<<<<<<< HEAD
*min_width += 20;
if (natural_width)
*natural_width += 20;
-=======
- *min_width += 8;
-
- if (natural_width)
- *natural_width += 8;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
}
static gboolean
color_combo_button_press_event_cb (GtkWidget *widget,
-<<<<<<< HEAD
- GdkEventButton *event)
-=======
GdkEventButton *event)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
EColorCombo *combo = E_COLOR_COMBO (widget);
GdkWindow *window;
@@ -446,11 +352,7 @@ color_combo_button_press_event_cb (GtkWidget *widget,
if (combo->priv->popup_shown) {
color_combo_popdown (combo);
} else {
-<<<<<<< HEAD
- color_combo_popup (combo);
-=======
color_combo_popup (combo);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
}
return FALSE;
@@ -458,13 +360,8 @@ color_combo_button_press_event_cb (GtkWidget *widget,
static void
color_combo_swatch_color_changed (EColorCombo *combo,
-<<<<<<< HEAD
- GdkRGBA *color,
- gpointer user_data)
-=======
GdkRGBA *color,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_signal_emit (combo, signals[ACTIVATED], 0, color);
@@ -475,13 +372,8 @@ color_combo_swatch_color_changed (EColorCombo *combo,
static void
color_combo_draw_frame_cb (GtkWidget *widget,
-<<<<<<< HEAD
- cairo_t *cr,
- gpointer user_data)
-=======
cairo_t *cr,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
EColorCombo *combo = user_data;
GdkRGBA rgba;
@@ -501,11 +393,7 @@ color_combo_draw_frame_cb (GtkWidget *widget,
static void
color_combo_set_default_color_cb (EColorCombo *combo,
-<<<<<<< HEAD
- gpointer user_data)
-=======
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
GdkRGBA color;
@@ -571,15 +459,8 @@ color_combo_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
-<<<<<<< HEAD
- EColorComboPrivate *priv;
- GdkRGBA color;
-
- priv = E_COLOR_COMBO_GET_PRIVATE (object);
-=======
GdkRGBA color;
EColorComboPrivate *priv = E_COLOR_COMBO (object)->priv;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
switch (property_id) {
case PROP_CURRENT_COLOR:
@@ -626,16 +507,6 @@ color_combo_dispose (GObject *object)
{
EColorComboPrivate *priv;
-<<<<<<< HEAD
- priv = E_COLOR_COMBO_GET_PRIVATE (object);
-
- if (priv->window != NULL) {
- gtk_widget_destroy (priv->window);
- priv->window = NULL;
- }
-
- if (priv->current_color != NULL) {
-=======
priv = E_COLOR_COMBO (object)->priv;
if (priv->palette) {
@@ -646,69 +517,39 @@ color_combo_dispose (GObject *object)
}
if (priv->current_color) {
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
gdk_rgba_free (priv->current_color);
priv->current_color = NULL;
}
-<<<<<<< HEAD
- if (priv->default_color != NULL) {
-=======
if (priv->default_color) {
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
gdk_rgba_free (priv->default_color);
priv->default_color = NULL;
}
-<<<<<<< HEAD
- g_list_free_full (priv->palette, (GDestroyNotify) gdk_rgba_free);
- priv->palette = NULL;
-
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
/* Chain up to parent's dispose() method. */
G_OBJECT_CLASS (e_color_combo_parent_class)->dispose (object);
}
static void
-<<<<<<< HEAD
-e_color_combo_class_init (EColorComboClass *class)
-=======
e_color_combo_class_init (EColorComboClass *klass)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
-<<<<<<< HEAD
- g_type_class_add_private (class, sizeof (EColorComboPrivate));
-
- object_class = G_OBJECT_CLASS (class);
-=======
e_color_combo_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (EColorComboPrivate));
object_class = G_OBJECT_CLASS (klass);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
object_class->set_property = color_combo_set_property;
object_class->get_property = color_combo_get_property;
object_class->dispose = color_combo_dispose;
-<<<<<<< HEAD
- widget_class = GTK_WIDGET_CLASS (class);
- widget_class->get_preferred_width = color_combo_get_preferred_width;
- widget_class->button_press_event = color_combo_button_press_event_cb;
-
- class->popup = color_combo_popup;
- class->popdown = color_combo_popdown;
-=======
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->get_preferred_width = color_combo_get_preferred_width;
widget_class->button_press_event = color_combo_button_press_event_cb;
klass->popup = color_combo_popup;
klass->popdown = color_combo_popdown;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
g_object_class_install_property (
object_class,
@@ -717,11 +558,7 @@ e_color_combo_class_init (EColorComboClass *klass)
"current-color",
"Current color",
"The currently selected color",
-<<<<<<< HEAD
- GDK_TYPE_RGBA,
-=======
GDK_TYPE_COLOR,
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_PARAM_READWRITE));
g_object_class_install_property (
@@ -731,11 +568,7 @@ e_color_combo_class_init (EColorComboClass *klass)
"default-color",
"Default color",
"The color associated with the default button",
-<<<<<<< HEAD
- GDK_TYPE_RGBA,
-=======
GDK_TYPE_COLOR,
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
@@ -782,11 +615,7 @@ e_color_combo_class_init (EColorComboClass *klass)
signals[ACTIVATED] = g_signal_new (
"activated",
-<<<<<<< HEAD
- G_OBJECT_CLASS_TYPE (class),
-=======
G_OBJECT_CLASS_TYPE (klass),
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EColorComboClass, activated),
NULL, NULL,
@@ -795,11 +624,7 @@ e_color_combo_class_init (EColorComboClass *klass)
signals[POPUP] = g_signal_new (
"popup",
-<<<<<<< HEAD
- G_OBJECT_CLASS_TYPE (class),
-=======
G_OBJECT_CLASS_TYPE (klass),
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EColorComboClass, popup),
NULL, NULL,
@@ -808,11 +633,7 @@ e_color_combo_class_init (EColorComboClass *klass)
signals[POPDOWN] = g_signal_new (
"popdown",
-<<<<<<< HEAD
- G_OBJECT_CLASS_TYPE (class),
-=======
G_OBJECT_CLASS_TYPE (klass),
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EColorComboClass, popdown),
NULL, NULL,
@@ -820,22 +641,6 @@ e_color_combo_class_init (EColorComboClass *klass)
G_TYPE_NONE, 0);
gtk_binding_entry_add_signal (
-<<<<<<< HEAD
- gtk_binding_set_by_class (class),
- GDK_KEY_Down, GDK_MOD1_MASK, "popup", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
- GDK_KEY_KP_Down, GDK_MOD1_MASK, "popup", 0);
-
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
- GDK_KEY_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
- GDK_KEY_KP_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-=======
gtk_binding_set_by_class (klass),
GDK_KEY_Down, GDK_MOD1_MASK, "popup", 0);
gtk_binding_entry_add_signal (
@@ -850,107 +655,18 @@ e_color_combo_class_init (EColorComboClass *klass)
GDK_KEY_KP_Up, GDK_MOD1_MASK, "popdown", 0);
gtk_binding_entry_add_signal (
gtk_binding_set_by_class (klass),
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
GDK_KEY_Escape, 0, "popdown", 0);
}
static void
e_color_combo_init (EColorCombo *combo)
{
-<<<<<<< HEAD
- GtkWidget *container;
- GtkWidget *toplevel;
-=======
GtkWidget *toplevel;
GtkWidget *layout;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
GtkWidget *widget;
GList *palette;
guint ii;
-<<<<<<< HEAD
- combo->priv = E_COLOR_COMBO_GET_PRIVATE (combo);
-
- widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_container_add (GTK_CONTAINER (combo), widget);
-
- container = widget;
-
- /* Build the combo button. */
- widget = gtk_frame_new (NULL);
- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
- g_signal_connect (
- widget, "draw",
- G_CALLBACK (color_combo_draw_frame_cb), combo);
- combo->priv->color_frame = widget; /* do not reference */
-
- widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-
- widget = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
- combo->priv->arrow = widget; /* do not reference */
-
- /* Build the drop-down menu */
- widget = gtk_window_new (GTK_WINDOW_POPUP);
- gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
- gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
- gtk_window_set_type_hint (
- GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_COMBO);
- combo->priv->window = g_object_ref_sink (widget);
-
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo));
- if (GTK_IS_WINDOW (toplevel)) {
- gtk_window_group_add_window (
- gtk_window_get_group (GTK_WINDOW (toplevel)),
- GTK_WINDOW (widget));
- gtk_window_set_transient_for (
- GTK_WINDOW (widget), GTK_WINDOW (toplevel));
- }
-
- g_signal_connect_swapped (
- widget, "show",
- G_CALLBACK (color_combo_child_show_cb), combo);
- g_signal_connect_swapped (
- widget, "hide",
- G_CALLBACK (color_combo_child_hide_cb), combo);
- g_signal_connect_swapped (
- widget, "button-press-event",
- G_CALLBACK (color_combo_window_button_press_event_cb), combo);
- g_signal_connect_swapped (
- widget, "button-release-event",
- G_CALLBACK (color_combo_window_button_release_event_cb), combo);
-
- container = widget;
-
- widget = gtk_grid_new ();
- gtk_grid_set_row_spacing (GTK_GRID (widget), 5);
- gtk_container_add (GTK_CONTAINER (container), widget);
-
- container = widget;
-
- widget = gtk_button_new ();
- gtk_grid_attach (GTK_GRID (container), widget, 0, 0, 1, 1);
- combo->priv->default_button = widget; /* do not reference */
-
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (color_combo_set_default_color_cb), combo);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (color_combo_popdown), combo);
-
- widget = e_color_chooser_widget_new ();
- g_object_set_data (G_OBJECT (widget), "window", combo->priv->window);
- gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1);
- combo->priv->chooser_widget = widget; /* do not reference */
-
- g_signal_connect_swapped (
- widget, "color-activated",
- G_CALLBACK (color_combo_swatch_color_changed), combo);
- g_signal_connect_swapped (
- widget, "editor-activated",
-=======
combo->priv = G_TYPE_INSTANCE_GET_PRIVATE (
combo, E_TYPE_COLOR_COMBO, EColorComboPrivate);
@@ -1026,7 +742,6 @@ e_color_combo_init (EColorCombo *combo)
G_CALLBACK (color_combo_swatch_color_changed), combo);
g_signal_connect_swapped (
combo->priv->chooser_widget, "editor-activated",
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_CALLBACK (color_combo_popdown), combo);
palette = NULL;
@@ -1042,8 +757,6 @@ e_color_combo_init (EColorCombo *combo)
combo->priv->current_color = gdk_rgba_copy (&black);
combo->priv->default_color = gdk_rgba_copy (&black);
-<<<<<<< HEAD
-=======
/*
for (ii = 0; ii < NUM_CUSTOM_COLORS; ii++) {
widget = color_combo_new_swatch_button (
@@ -1055,7 +768,6 @@ e_color_combo_init (EColorCombo *combo)
gtk_bin_get_child (GTK_BIN (widget)));
}
*/
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
}
GtkWidget *
@@ -1066,11 +778,7 @@ e_color_combo_new (void)
GtkWidget *
e_color_combo_new_defaults (GdkRGBA *default_color,
-<<<<<<< HEAD
- const gchar *default_label)
-=======
const gchar *default_label)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_val_if_fail (default_color != NULL, NULL);
g_return_val_if_fail (default_label != NULL, NULL);
@@ -1100,11 +808,7 @@ e_color_combo_popdown (EColorCombo *combo)
void
e_color_combo_get_current_color (EColorCombo *combo,
-<<<<<<< HEAD
- GdkRGBA *color)
-=======
GdkRGBA *color)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
g_return_if_fail (color != NULL);
@@ -1117,11 +821,7 @@ e_color_combo_get_current_color (EColorCombo *combo,
void
e_color_combo_set_current_color (EColorCombo *combo,
-<<<<<<< HEAD
- const GdkRGBA *color)
-=======
const GdkRGBA *color)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
@@ -1137,10 +837,7 @@ e_color_combo_set_current_color (EColorCombo *combo,
gdk_rgba_free (combo->priv->current_color);
}
-<<<<<<< HEAD
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
combo->priv->current_color = gdk_rgba_copy (color);
gtk_color_chooser_set_rgba (
@@ -1152,11 +849,7 @@ e_color_combo_set_current_color (EColorCombo *combo,
void
e_color_combo_get_default_color (EColorCombo *combo,
-<<<<<<< HEAD
- GdkRGBA *color)
-=======
GdkRGBA *color)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
g_return_if_fail (color != NULL);
@@ -1169,11 +862,7 @@ e_color_combo_get_default_color (EColorCombo *combo,
void
e_color_combo_set_default_color (EColorCombo *combo,
-<<<<<<< HEAD
- const GdkRGBA *color)
-=======
const GdkRGBA *color)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
@@ -1206,11 +895,7 @@ e_color_combo_get_default_label (EColorCombo *combo)
void
e_color_combo_set_default_label (EColorCombo *combo,
-<<<<<<< HEAD
- const gchar *text)
-=======
const gchar *text)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
@@ -1229,11 +914,7 @@ e_color_combo_get_default_transparent (EColorCombo *combo)
void
e_color_combo_set_default_transparent (EColorCombo *combo,
-<<<<<<< HEAD
- gboolean transparent)
-=======
gboolean transparent)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
g_return_if_fail (E_IS_COLOR_COMBO (combo));
@@ -1252,11 +933,7 @@ e_color_combo_get_palette (EColorCombo *combo)
void
e_color_combo_set_palette (EColorCombo *combo,
-<<<<<<< HEAD
- GList *palette)
-=======
GList *palette)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
gint ii, count, colors_per_line;
GList *iter;
@@ -1268,11 +945,7 @@ e_color_combo_set_palette (EColorCombo *combo,
colors_per_line = (count % 10 == 0) ? 10 : 9;
colors = g_malloc_n (count, sizeof (GdkRGBA));
-<<<<<<< HEAD
- g_list_free_full (combo->priv->palette, (GDestroyNotify) gdk_rgba_free);
-=======
g_list_free_full (combo->priv->palette, (GDestroyNotify) gdk_color_free);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
ii = 0;
combo->priv->palette = NULL;
for (iter = palette; iter; iter = g_list_next (iter)) {
@@ -1284,10 +957,7 @@ e_color_combo_set_palette (EColorCombo *combo,
}
combo->priv->palette = g_list_reverse (combo->priv->palette);
-<<<<<<< HEAD
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
gtk_color_chooser_add_palette (
GTK_COLOR_CHOOSER (combo->priv->chooser_widget),
GTK_ORIENTATION_HORIZONTAL, 0, 0, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
