← Back to branch summary

~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to src/brasero-playlist.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-18 17:53:39 UTC
  • mfrom: (1.1.47 upstream) (1.4.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110518175339-so6a6fejezs5i1pc
Tags: 3.0.0-1ubuntu1
* Rebase from Debian and GNOME3 PPA. Remaining Ubuntu changes:
* debian/control:
  - Build-Depend on dh-autoreconf, libappindicator3-dev and
    liblaunchpad-integration-3.0-dev
  - Recommends: brasero-cdrkit
  - libbrasero-media3-1 Depends on dvd+rw-tools not growisofs and
    Suggests rather than Recommends gstreamer plugin packages
* debian/patches/010_lpi.patch:
  - Launchpad integration patch
* debian/patches/012_appindicator.patch:
  - Use application indicators
* debian/rules:
  - Include autoreconf.mk
* debian/watch:
  - Watch unstable releases also

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-playlist.c
112
112
{
113
113
        GtkRequisition requisition;
114
114
 
115
 
        gtk_widget_size_request (gtk_widget_get_parent (BRASERO_PLAYLIST (object)->priv->button_add),
116
 
                                 &requisition);
 
115
        gtk_widget_get_preferred_size (gtk_widget_get_parent (BRASERO_PLAYLIST (object)->priv->button_add),
 
116
                                 &requisition, NULL);
117
117
        (*footer) = requisition.height + BRASERO_PLAYLIST_SPACING;
118
118
}
119
119
 
132
132
                cursor = gdk_cursor_new (GDK_WATCH);
133
133
                gdk_window_set_cursor (window,
134
134
                                       cursor);
135
 
                gdk_cursor_unref (cursor);
 
135
                g_object_unref (cursor);
136
136
        }
137
137
        playlist->priv->activity_counter++;
138
138
}
208
208
}
209
209
 
210
210
static gboolean
211
 
brasero_playlist_expose_event_cb (GtkWidget *widget,
212
 
                                  gpointer event,
213
 
                                  gpointer null_data)
 
211
brasero_playlist_draw_cb (GtkWidget *widget,
 
212
                          cairo_t *cr,
 
213
                          gpointer null_data)
214
214
{
215
215
        BraseroPlaylist *playlist = BRASERO_PLAYLIST (widget);
216
216
 
840
840
}
841
841
 
842
842
static void
843
 
brasero_playlist_destroy (GtkObject *object)
 
843
brasero_playlist_destroy (GtkWidget *object)
844
844
{
845
845
        BraseroPlaylist *playlist = BRASERO_PLAYLIST (object);
846
846
 
863
863
                playlist->priv->parse_type = NULL;
864
864
        }
865
865
 
866
 
        if (GTK_OBJECT_CLASS (brasero_playlist_parent_class)->destroy)
867
 
                GTK_OBJECT_CLASS (brasero_playlist_parent_class)->destroy (object);
 
866
        if (GTK_WIDGET_CLASS (brasero_playlist_parent_class)->destroy)
 
867
                GTK_WIDGET_CLASS (brasero_playlist_parent_class)->destroy (object);
868
868
}
869
869
 
870
870
static void
883
883
brasero_playlist_class_init (BraseroPlaylistClass *klass)
884
884
{
885
885
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
886
 
        GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
 
886
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
887
887
 
888
888
        object_class->finalize = brasero_playlist_finalize;
889
 
        gtkobject_class->destroy = brasero_playlist_destroy;
 
889
        widget_class->destroy = brasero_playlist_destroy;
890
890
}
891
891
 
892
892
static void
910
910
        obj = BRASERO_PLAYLIST (g_object_new (BRASERO_TYPE_PLAYLIST, NULL));
911
911
 
912
912
        g_signal_connect (obj,
913
 
                          "expose-event",
914
 
                          G_CALLBACK (brasero_playlist_expose_event_cb),
 
913
                          "draw",
 
914
                          G_CALLBACK (brasero_playlist_draw_cb),
915
915
                          NULL);
916
916
 
917
917
        return GTK_WIDGET (obj);