[gnome-panel] panel: fix deprecated warnings (part 2)

[Philipp Kaluza <phk src gnome org>]

commit b9d4b2c21b2ed757aa64169e7cc07523ba9c3965
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Aug 17 01:00:37 2013 +0300

    panel: fix deprecated warnings (part 2)

 gnome-panel/panel-properties-dialog.c |    6 +++---
 gnome-panel/panel-toplevel.c          |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gnome-panel/panel-properties-dialog.c b/gnome-panel/panel-properties-dialog.c
index e9b42be..dae096b 100644
--- a/gnome-panel/panel-properties-dialog.c
+++ b/gnome-panel/panel-properties-dialog.c
@@ -429,7 +429,7 @@ panel_properties_dialog_background_color_update_from_rgba (PanelPropertiesDialog
                gtk_range_set_value (GTK_RANGE (dialog->opacity_scale),
                                     color->alpha * 100.);
        if (dialog->color_button)
-               gtk_color_button_set_rgba (GTK_COLOR_BUTTON (dialog->color_button),
+               gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog->color_button),
                                           color);
 }
 
@@ -459,13 +459,13 @@ panel_properties_dialog_background_color_update (PanelPropertiesDialog *dialog)
 
 static void
 panel_properties_dialog_color_button_changed (PanelPropertiesDialog *dialog,
-                                             GtkColorButton        *color_button)
+                                             GtkColorChooser        *color_button)
 {
        GdkRGBA old_color;
        GdkRGBA new_color;
 
        panel_properties_dialog_background_color_get_rgba (dialog, &old_color);
-       gtk_color_button_get_rgba (color_button, &new_color);
+       gtk_color_chooser_get_rgba (color_button, &new_color);
        new_color.alpha = old_color.alpha;
        panel_properties_dialog_background_color_set_from_rgba (dialog, &new_color);
 }
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index ea94b6b..5cb5d69 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -2270,7 +2270,7 @@ calculate_minimum_height (GtkWidget        *widget,
   
        state = gtk_widget_get_state_flags (widget);
        style_context = gtk_widget_get_style_context (widget);
-        font_desc = gtk_style_context_get_font (style_context, state);
+        gtk_style_context_get (style_context, state, "font", &font_desc, NULL);
 
        pango_context = gtk_widget_get_pango_context (widget);
        metrics = pango_context_get_metrics (pango_context,