← Back to branch summary

~ubuntu-branches/ubuntu/wily/baobab/wily

« back to all changes in this revision

Viewing changes to src/egg-list-box.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-11-05 18:19:47 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20121105181947-a5c9utsx2buosfmy
Tags: 3.6.2-0ubuntu1
https://launchpad.net/bugs/1020810
* New upstream version:
  - Minor tweaks to the UI
* debian/patches/baobab_about_segfault.patch: 
  - don't segfault when opening the about dialog (lp: #1020810)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/egg-list-box.c
1045
1045
  EggListBoxPrivate *priv = list_box->priv;
1046
1046
  GtkAllocation allocation = {0};
1047
1047
  GtkStyleContext* context;
 
1048
  GtkStateFlags state;
1048
1049
  ChildFlags flags[3], *found;
1049
1050
  gint flags_length;
1050
1051
  int i;
1051
1052
 
1052
1053
  gtk_widget_get_allocation (GTK_WIDGET (list_box), &allocation);
1053
1054
  context = gtk_widget_get_style_context (GTK_WIDGET (list_box));
 
1055
  state = gtk_widget_get_state_flags (widget);
1054
1056
  gtk_render_background (context, cr, (gdouble) 0, (gdouble) 0, (gdouble) allocation.width, (gdouble) allocation.height);
1055
1057
  flags_length = 0;
1056
1058
 
1057
1059
  if (priv->selected_child != NULL)
1058
1060
    {
1059
1061
      found = child_flags_find_or_add (flags, &flags_length, priv->selected_child);
1060
 
      found->state |= GTK_STATE_FLAG_SELECTED;
 
1062
      found->state |= (state | GTK_STATE_FLAG_SELECTED);
1061
1063
    }
1062
1064
 
1063
1065
  if (priv->prelight_child != NULL)
1064
1066
    {
1065
1067
      found = child_flags_find_or_add (flags, &flags_length, priv->prelight_child);
1066
 
      found->state |= GTK_STATE_FLAG_PRELIGHT;
 
1068
      found->state |= (state | GTK_STATE_FLAG_PRELIGHT);
1067
1069
    }
1068
1070
 
1069
1071
  if (priv->active_child != NULL && priv->active_child_active)
1070
1072
    {
1071
1073
      found = child_flags_find_or_add (flags, &flags_length, priv->active_child);
1072
 
      found->state |= GTK_STATE_FLAG_ACTIVE;
 
1074
      found->state |= (state | GTK_STATE_FLAG_ACTIVE);
1073
1075
    }
1074
1076
 
1075
1077
  for (i = 0; i < flags_length; i++)