[rhythmbox] [cd-recorder] fix compilation when using G_SEAL
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] [cd-recorder] fix compilation when using G_SEAL
- Date: Tue, 6 Apr 2010 18:29:13 +0000 (UTC)
commit 55777fcb6ec68fd6e257425dfe66023225e9d440
Author: Christophe Fergeau <cfergeau mandriva com>
Date: Thu Apr 1 23:20:42 2010 +0200
[cd-recorder] fix compilation when using G_SEAL
plugins/cd-recorder/rb-cd-recorder-plugin.c | 20 ++++++++++----------
plugins/cd-recorder/rb-playlist-source-recorder.c | 18 ++++++++++++------
2 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/plugins/cd-recorder/rb-cd-recorder-plugin.c b/plugins/cd-recorder/rb-cd-recorder-plugin.c
index 184e50e..493cb6e 100644
--- a/plugins/cd-recorder/rb-cd-recorder-plugin.c
+++ b/plugins/cd-recorder/rb-cd-recorder-plugin.c
@@ -43,6 +43,7 @@
#include "rb-playlist-source.h"
#include "rb-dialog.h"
#include "rb-file-helpers.h"
+#include "gseal-gtk-compat.h"
#include "rb-recorder.h"
#include "rb-playlist-source-recorder.h"
@@ -238,16 +239,15 @@ cmd_duplicate_cd (GtkAction *action,
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (pi->selected_source));
- dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "<b>%s</b>\n\n%s\n%s: %s",
- _("Could not duplicate disc"),
- _("Rhythmbox could not duplicate the disc"),
- _("Reason"),
- error->message);
- gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), TRUE);
+ dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "<b>%s</b>\n\n%s\n%s: %s",
+ _("Could not duplicate disc"),
+ _("Rhythmbox could not duplicate the disc"),
+ _("Reason"),
+ error->message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
g_error_free (error);
diff --git a/plugins/cd-recorder/rb-playlist-source-recorder.c b/plugins/cd-recorder/rb-playlist-source-recorder.c
index b0f09de..c8c7e55 100644
--- a/plugins/cd-recorder/rb-playlist-source-recorder.c
+++ b/plugins/cd-recorder/rb-playlist-source-recorder.c
@@ -157,17 +157,21 @@ rb_playlist_source_recorder_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
GtkDialog *dialog;
+ GtkWidget *action_area;
+ GtkWidget *content_area;
if (GTK_WIDGET_CLASS (rb_playlist_source_recorder_parent_class)->style_set)
GTK_WIDGET_CLASS (rb_playlist_source_recorder_parent_class)->style_set (widget, previous_style);
dialog = GTK_DIALOG (widget);
- gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12);
- gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24);
+ content_area = gtk_dialog_get_content_area (dialog);
+ gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
+ gtk_box_set_spacing (GTK_BOX (content_area), 24);
- gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0);
- gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+ action_area = gtk_dialog_get_action_area (dialog);
+ gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
+ gtk_box_set_spacing (GTK_BOX (action_area), 6);
}
static void
@@ -1104,6 +1108,7 @@ rb_playlist_source_recorder_constructed (GObject *object)
PangoAttrList *pattrlist;
PangoAttribute *attr;
char *value;
+ GtkStyle *style;
RB_CHAIN_GOBJECT_METHOD (rb_playlist_source_recorder_parent_class, constructed, object);
source = RB_PLAYLIST_SOURCE_RECORDER (object);
@@ -1196,7 +1201,8 @@ rb_playlist_source_recorder_constructed (GObject *object)
attr->end_index = G_MAXINT;
pango_attr_list_insert (pattrlist, attr);
- font_size = pango_font_description_get_size (GTK_WIDGET (source->priv->message_label)->style->font_desc);
+ style = gtk_widget_get_style (GTK_WIDGET (source->priv->message_label));
+ font_size = pango_font_description_get_size (style->font_desc);
attr = pango_attr_size_new (font_size * 1.2);
attr->start_index = 0;
attr->end_index = G_MAXINT;
@@ -1206,7 +1212,7 @@ rb_playlist_source_recorder_constructed (GObject *object)
pango_attr_list_unref (pattrlist);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (source)->vbox),
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (source))),
source->priv->vbox,
TRUE, TRUE, 0);
gtk_widget_show_all (source->priv->vbox);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]