[libegg/spread-table-dnd] thumbnailpreview: Ported to GTK+ 3
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libegg/spread-table-dnd] thumbnailpreview: Ported to GTK+ 3
- Date: Fri, 18 Mar 2011 22:33:41 +0000 (UTC)
commit 83c735ee967785b9cd81d713fe517a29e1d6ec68
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 18 23:33:34 2011 +0100
thumbnailpreview: Ported to GTK+ 3
libegg/thumbnailpreview/Makefile.am | 4 ++--
libegg/thumbnailpreview/eggthumbnailpreview.c | 7 ++++---
libegg/thumbnailpreview/eggthumbnailpreview.h | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/libegg/thumbnailpreview/Makefile.am b/libegg/thumbnailpreview/Makefile.am
index 53c2a4b..e72bbe4 100644
--- a/libegg/thumbnailpreview/Makefile.am
+++ b/libegg/thumbnailpreview/Makefile.am
@@ -5,13 +5,13 @@ INCLUDES = \
-I$(top_srcdir)/libegg/util \
-I$(top_srcdir)/libegg/pixbufthumbnail \
-DG_LOG_DOMAIN=\""EggThumbnailPreview"\" \
- $(EGG_CFLAGS)
+ $(EGG_30_CFLAGS)
noinst_LTLIBRARIES = \
libeggthumbnailpreview.la
libeggthumbnailpreview_la_LIBADD = \
- $(EGG_LIBS) \
+ $(EGG_30_LIBS) \
$(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
libeggthumbnailpreview_la_SOURCES = \
diff --git a/libegg/thumbnailpreview/eggthumbnailpreview.c b/libegg/thumbnailpreview/eggthumbnailpreview.c
index 4993e8b..1b6fc33 100644
--- a/libegg/thumbnailpreview/eggthumbnailpreview.c
+++ b/libegg/thumbnailpreview/eggthumbnailpreview.c
@@ -25,8 +25,7 @@
#include <glib/gi18n.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include "egg-pixbuf-thumbnail.h"
@@ -484,7 +483,9 @@ label_style_set (GtkWidget *label,
{
PangoFontDescription *font_desc;
- font_desc = pango_font_description_copy (label->style->font_desc);
+ GtkStyleContext *style = gtk_widget_get_style_context (label);
+ font_desc = pango_font_description_copy (
+ gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL));
pango_font_description_set_size (font_desc,
pango_font_description_get_size (font_desc) * PANGO_SCALE_SMALL);
g_signal_handlers_block_by_func (label, label_style_set, NULL);
diff --git a/libegg/thumbnailpreview/eggthumbnailpreview.h b/libegg/thumbnailpreview/eggthumbnailpreview.h
index dbdfd45..6a258a2 100644
--- a/libegg/thumbnailpreview/eggthumbnailpreview.h
+++ b/libegg/thumbnailpreview/eggthumbnailpreview.h
@@ -20,7 +20,7 @@
#ifndef __EGG_THUMBNAIL_PREVIEW_H__
#define __EGG_THUMBNAIL_PREVIEW_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]