diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-02-14 21:17:24 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-02-14 21:17:24 -0600 |
| commit | ecaf87264769ac093530341f8b2221622394948f (patch) | |
| tree | 3fcbe661830cabc1f910b234aece9249020e3b16 | |
| parent | 6749bbb52d4ffb13c2f4f0c24745421d33fcf788 (diff) | |
| parent | 895a0a2c7fcaa05bf4ea3415276af26bde90b769 (diff) | |
| download | ayatana-indicator-datetime-ecaf87264769ac093530341f8b2221622394948f.tar.gz ayatana-indicator-datetime-ecaf87264769ac093530341f8b2221622394948f.tar.bz2 ayatana-indicator-datetime-ecaf87264769ac093530341f8b2221622394948f.zip | |
Charles Kerr 2012-02-14 Fix FTB when deprecation warnings are enabled
| -rw-r--r-- | libmap/cc-timezone-map.c | 14 | ||||
| -rw-r--r-- | src/datetime-service.c | 14 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 8 |
3 files changed, 28 insertions, 8 deletions
diff --git a/libmap/cc-timezone-map.c b/libmap/cc-timezone-map.c index aeac9a0..ff6eee8 100644 --- a/libmap/cc-timezone-map.c +++ b/libmap/cc-timezone-map.c @@ -743,19 +743,25 @@ cc_timezone_map_draw (GtkWidget *widget, GError *err = NULL; gdouble pointx, pointy; gdouble alpha = 1.0; - GtkStyle *style; char buf[16]; gtk_widget_get_allocation (widget, &alloc); - style = gtk_widget_get_style (widget); - /* Check if insensitive */ - if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE) + if (gtk_widget_get_sensitive (widget)) alpha = 0.5; /* paint background */ +#if GTK_CHECK_VERSION(3,0,0) + GdkRGBA rgba; + gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), + gtk_widget_get_state_flags (widget), + &rgba); + gdk_cairo_set_source_rgba (cr, &rgba); +#else + GtkStyle * style = gtk_widget_get_style (widget); gdk_cairo_set_source_color (cr, &style->bg[gtk_widget_get_state (widget)]); +#endif cairo_paint (cr); gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0); cairo_paint_with_alpha (cr, alpha); diff --git a/src/datetime-service.c b/src/datetime-service.c index 8358a80..227022f 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -979,13 +979,19 @@ update_appointment_menu_items (gpointer user_data) // Draw the correct icon for the appointment type and then tint it using mask fill. // For now we'll create a circle if (color_spec != NULL) { - GdkColor color; - gdk_color_parse (color_spec, &color); g_debug("Creating a cairo surface: size, %d by %d", width, height); cairo_surface_t *surface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, width, height ); - cairo_t *cr = cairo_create(surface); - gdk_cairo_set_source_color(cr, &color); + cairo_t *cr = cairo_create(surface); +#if GTK_CHECK_VERSION(3,0,0) + GdkRGBA rgba; + if (gdk_rgba_parse (&rgba, color_spec)) + gdk_cairo_set_source_rgba (cr, &rgba); +#else + GdkColor color; + if (gdk_color_parse (color_spec, &color)) + gdk_cairo_set_source_color (cr, &color); +#endif cairo_paint(cr); cairo_set_source_rgba(cr, 0,0,0,0.5); cairo_set_line_width(cr, 1); diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index f7fb130..38f178b 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1261,7 +1261,11 @@ new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu mi_data->gmi = gtk_menu_item_new(); +#if GTK_CHECK_VERSION(3,0,0) + GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); +#else GtkWidget * hbox = gtk_hbox_new(FALSE, 4); +#endif /* Icon, probably someone's face or avatar on an IM */ mi_data->icon = gtk_image_new(); @@ -1472,7 +1476,11 @@ new_timezone_item(DbusmenuMenuitem * newitem, gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); +#if GTK_CHECK_VERSION(3,0,0) + GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); +#else GtkWidget * hbox = gtk_hbox_new(FALSE, 4); +#endif /* Label, probably a username, chat room or mailbox name */ mi_data->label = gtk_label_new(""); |