Commit 7adc0153 authored by Philippe Rouquier's avatar Philippe Rouquier Committed by Philippe Rouquier

Lots of update in one patch to address issues raised during discussion on

2009-01-14  Philippe Rouquier  <bonfire-app@wanadoo.fr>

	Lots of update in one patch to address issues raised during discussion on ML

	Nautilus extension:
	- use libbrasero-media
	- add an icon to the button
	- make it modal to nautilus

	Brasero:
	Fix and respect parenting from commandline xid
	Fix a warning and a title incorrectly set for video projects
	Fixed a unknown symbol for libisofs
	Fixed a recursive signal leading to crash in burn-session.c

	Libbrasero-media:
	Some more documentation
	Added some compile information to be available for apps linking against it
	(version, install path)
	Rewrote brasero-drive-selection because of licencing issues
	Simplified signals for brasero-medium-selection
	For both widgets now, signal and properties match

	Misc:
	Fix bogus name (ykw) for licencing
	Fix a crash when removing the GConf key for a plugin
	
	* configure.in:
	* libbrasero-media/brasero-drive-selection.c
	(brasero_drive_selection_set_current_drive),
	(brasero_drive_selection_changed),
	(brasero_drive_selection_set_active),
	(brasero_drive_selection_get_active),
	(brasero_drive_selection_update_no_disc_entry),
	(brasero_drive_selection_add_no_disc_entry),
	(brasero_drive_selection_show_type),
	(brasero_drive_selection_drive_added_cb),
	(brasero_drive_selection_drive_removed_cb),
	(brasero_drive_selection_init), (brasero_drive_selection_finalize),
	(brasero_drive_selection_set_property),
	(brasero_drive_selection_get_property),
	(brasero_drive_selection_class_init),
	(brasero_drive_selection_new):
	* libbrasero-media/brasero-drive-selection.h:
	* libbrasero-media/brasero-drive.c:
	* libbrasero-media/brasero-media-private.h:
	* libbrasero-media/brasero-media.c:
	* libbrasero-media/brasero-media.h:
	* libbrasero-media/brasero-media.h.in:
	* libbrasero-media/brasero-medium-monitor.h:
	* libbrasero-media/brasero-medium-selection.c
	(brasero_medium_selection_set_current_medium),
	(brasero_medium_selection_changed),
	(brasero_medium_selection_set_active),
	(brasero_medium_selection_get_active),
	(brasero_medium_selection_update_no_disc_entry),
	(brasero_medium_selection_show_media_type),
	(brasero_medium_selection_medium_added_cb),
	(brasero_medium_selection_medium_removed_cb),
	(brasero_medium_selection_class_init):
	* libbrasero-media/brasero-medium-selection.h:
	* libbrasero-media/brasero-medium.c (brasero_medium_get_tooltip):
	* libbrasero-media/brasero-volume.h:
	* nautilus/Makefile.am:
	* nautilus/nautilus-burn-bar.c (nautilus_disc_burn_bar_init):
	* nautilus/nautilus-burn-extension.c (launch_process),
	(launch_brasero_on_window), (write_iso_activate_cb),
	(copy_disc_activate_cb), (blank_disc_activate_cb),
	(check_disc_activate_cb), (volume_is_blank), (drive_is_cd_device),
	(nautilus_module_initialize), (nautilus_module_shutdown):
	* src/brasero-app.c (brasero_app_current_toplevel_destroyed),
	(brasero_app_set_toplevel), (brasero_app_run_mainwin):
	* src/brasero-burn-options.c (brasero_burn_options_init):
	* src/brasero-dest-selection.c
	(brasero_dest_selection_medium_changed),
	(brasero_dest_selection_class_init):
	* src/brasero-disc.c (brasero_disc_get_use_info_notebook):
	* src/brasero-project.c (brasero_project_set_uri):
	* src/brasero-src-selection.c
	(brasero_src_selection_medium_changed),
	(brasero_src_selection_set_property),
	(brasero_src_selection_class_init):
	* src/brasero-tool-dialog.c (brasero_tool_dialog_init):
	* src/burn-plugin.c (brasero_plugin_priority_changed):
	* src/burn-session.c (brasero_burn_session_set_input_type):
	* src/plugins/libburnia/burn-libisofs.c
	(brasero_libisofs_create_volume_thread):

svn path=/trunk/; revision=1748
parent 6516ddae
This diff is collapsed.
......@@ -20,7 +20,7 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
LIBBRASERO_LT_VERSION=0:0:0
LIBBRASERO_LT_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE
AC_SUBST(LIBBRASERO_LT_VERSION)
AC_DEFINE_UNQUOTED(BRASERO_MAJOR_VERSION, $BRASERO_MAJOR_VERSION, [major version])
......@@ -420,6 +420,7 @@ data/icons/Makefile
help/Makefile
nautilus/Makefile
libbrasero-media/Makefile
libbrasero-media/brasero-media.h
src/plugins/Makefile
src/plugins/cdrdao/Makefile
src/plugins/cdrkit/Makefile
......
This diff is collapsed.
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* brasero-drive-selection.h
*
* Copyright (C) 2002-2004 Bastien Nocera <hadess@hadess.net>
* Copyright (C) 2005-2006 William Jon McCann <mccann@jhu.edu>
* Copyright (C) 2009 Philippe Rouquier <bonfire-app@wanadoo.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
* brasero
* Copyright (C) Philippe Rouquier 2005-2008 <bonfire-app@wanadoo.fr>
*
* Brasero is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* brasero is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Bastien Nocera <hadess@hadess.net>
* William Jon McCann <mccann@jhu.edu>
* along with brasero. If not, write to:
* The Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
#ifndef _BRASERO_DRIVE_SELECTION_H_
#define _BRASERO_DRIVE_SELECTION_H_
#include <glib-object.h>
#include <gtk/gtk.h>
#include <brasero-drive.h>
#include <brasero-medium-monitor.h>
#include <brasero-drive.h>
G_BEGIN_DECLS
#define BRASERO_TYPE_DRIVE_SELECTION (brasero_drive_selection_get_type ())
#define BRASERO_DRIVE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_DRIVE_SELECTION, BraseroDriveSelection))
#define BRASERO_DRIVE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_DRIVE_SELECTION, BraseroDriveSelectionClass))
#define BRASERO_IS_DRIVE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, BRASERO_TYPE_DRIVE_SELECTION))
#define BRASERO_IS_DRIVE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_DRIVE_SELECTION))
#define BRASERO_TYPE_DRIVE_SELECTION (brasero_drive_selection_get_type ())
#define BRASERO_DRIVE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_DRIVE_SELECTION, BraseroDriveSelection))
#define BRASERO_DRIVE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_DRIVE_SELECTION, BraseroDriveSelectionClass))
#define BRASERO_IS_DRIVE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_DRIVE_SELECTION))
#define BRASERO_IS_DRIVE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_DRIVE_SELECTION))
#define BRASERO_DRIVE_SELECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_DRIVE_SELECTION, BraseroDriveSelectionClass))
typedef struct _BraseroDriveSelectionClass BraseroDriveSelectionClass;
typedef struct _BraseroDriveSelection BraseroDriveSelection;
struct _BraseroDriveSelectionClass
{
GtkComboBoxClass parent_class;
typedef struct {
GtkComboBox widget;
} BraseroDriveSelection;
/* Signals */
void (* drive_changed) (BraseroDriveSelection *selection,
BraseroDrive *drive);
};
typedef struct {
GtkComboBoxClass parent_class;
struct _BraseroDriveSelection
{
GtkComboBox parent_instance;
};
void (* drive_changed) (GtkWidget *selection,
BraseroDrive *drive);
} BraseroDriveSelectionClass;
GType brasero_drive_selection_get_type (void) G_GNUC_CONST;
GtkWidget* brasero_drive_selection_new (void);
GType brasero_drive_selection_get_type (void) G_GNUC_CONST;
GtkWidget *brasero_drive_selection_new (void);
BraseroDrive *
brasero_drive_selection_get_active (BraseroDriveSelection *selection);
void brasero_drive_selection_set_active (BraseroDriveSelection *selection,
BraseroDrive *drive);
BraseroDrive *brasero_drive_selection_get_active (BraseroDriveSelection *selection);
gboolean
brasero_drive_selection_set_active (BraseroDriveSelection *selection,
BraseroDrive *drive);
void brasero_drive_selection_show_type (BraseroDriveSelection *drive,
BraseroDriveType type);
void
brasero_drive_selection_show_type (BraseroDriveSelection *selection,
BraseroDriveType type);
G_END_DECLS
......
......@@ -98,7 +98,7 @@ brasero_volume_new (BraseroDrive *drive, const gchar *udi);
*
* Returns the #GDrive corresponding to this #BraseroDrive
*
* Return value: a #GDrive or NULL.
* Return value: a #GDrive or NULL. Unref after use.
**/
GDrive *
brasero_drive_get_gdrive (BraseroDrive *drive)
......
......@@ -2,8 +2,8 @@
* burn-media-private.h
*
* Wed Oct 8 16:42:17 2008
* Copyright 2008 ykw
* <ykw@localhost.localdomain>
* Copyright 2008 Rouquier Philippe
* <bonfire-app@wanadoo.fr>
****************************************************************************/
/*
......
......@@ -2,8 +2,8 @@
* burn-media.c
*
* Wed Oct 8 16:40:48 2008
* Copyright 2008 ykw
* <ykw@localhost.localdomain>
* Copyright 2008 Rouquier Philippe
* <bonfire-app@wanadoo.fr>
****************************************************************************/
/*
......
......@@ -2,8 +2,8 @@
* burn-media.h
*
* Wed Oct 8 16:42:17 2008
* Copyright 2008 ykw
* <ykw@localhost.localdomain>
* Copyright 2008 Philippe Rouquier
* <bonfire-app@wanadoo.fr>
****************************************************************************/
/*
......@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 021101301, USA
*/
#ifndef _BURN_MEDIA_H
......@@ -29,6 +29,21 @@
G_BEGIN_DECLS
/**
* Some needed information about the library
*/
#define LIBBRASERO_MEDIA_VERSION_MAJOR \
@BRASERO_MAJOR_VERSION@
#define LIBBRASERO_MEDIA_VERSION_MINOR \
@BRASERO_MINOR_VERSION@
#define LIBBRASERO_MEDIA_VERSION_MICRO \
@BRASERO_SUB@
#define LIBBRASERO_MEDIA_AGE \
@LT_CURRENT@@LT_REVISION@@LT_AGE@
#define LIBBRASERO_MEDIA_INSTALL \
"@prefix@"
/**
* To start and stop the library
*/
......@@ -216,3 +231,4 @@ G_END_DECLS
#endif /* _BURN_MEDIA_H */
......@@ -25,6 +25,7 @@
#include <glib-object.h>
#include <brasero-medium.h>
#include <brasero-drive.h>
G_BEGIN_DECLS
......@@ -46,10 +47,10 @@ struct _BraseroMediumMonitorClass
/* Signals */
void (*drive_added) (BraseroMediumMonitor *monitor,
BraseroDrive *medium);
BraseroDrive *drive);
void (*drive_removed) (BraseroMediumMonitor *monitor,
BraseroDrive*medium);
BraseroDrive *drive);
void (*medium_added) (BraseroMediumMonitor *monitor,
BraseroMedium *medium);
......
......@@ -40,6 +40,8 @@
typedef struct _BraseroMediumSelectionPrivate BraseroMediumSelectionPrivate;
struct _BraseroMediumSelectionPrivate
{
BraseroMedium *active;
BraseroMediaType type;
gulong added_sig;
gulong removed_sig;
......@@ -48,8 +50,7 @@ struct _BraseroMediumSelectionPrivate
#define BRASERO_MEDIUM_SELECTION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM_SELECTION, BraseroMediumSelectionPrivate))
typedef enum {
ADDED_SIGNAL,
REMOVED_SIGNAL,
CHANGED_SIGNAL,
LAST_SIGNAL
} BraseroMediumSelectionSignalType;
......@@ -200,6 +201,42 @@ brasero_medium_selection_update_media_string (BraseroMediumSelection *self)
} while (gtk_tree_model_iter_next (model, &iter));
}
static void
brasero_medium_selection_set_current_medium (BraseroMediumSelection *self,
GtkTreeIter *iter)
{
BraseroMediumSelectionPrivate *priv;
BraseroMedium *medium = NULL;
GtkTreeModel *model;
priv = BRASERO_MEDIUM_SELECTION_PRIVATE (self);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self));
gtk_tree_model_get (model, iter,
MEDIUM_COL, &medium,
-1);
if (priv->active == medium)
return;
if (priv->active)
g_object_unref (priv->active);
priv->active = medium;
if (priv->active) {
gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
g_object_ref (priv->active);
}
else
gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
g_signal_emit (self,
brasero_medium_selection_signals [CHANGED_SIGNAL],
0,
priv->active);
}
static void
brasero_drive_selection_set_tooltip (BraseroMediumSelection *self)
{
......@@ -222,9 +259,17 @@ brasero_drive_selection_set_tooltip (BraseroMediumSelection *self)
}
static void
brasero_medium_selection_changed (GtkComboBox *box)
brasero_medium_selection_changed (GtkComboBox *combo)
{
brasero_drive_selection_set_tooltip (BRASERO_MEDIUM_SELECTION (box));
GtkTreeModel *model;
GtkTreeIter iter;
model = gtk_combo_box_get_model (combo);
if (!gtk_combo_box_get_active_iter (combo, &iter))
return;
brasero_medium_selection_set_current_medium (BRASERO_MEDIUM_SELECTION (combo), &iter);
brasero_drive_selection_set_tooltip (BRASERO_MEDIUM_SELECTION (combo));
}
/**
......@@ -232,7 +277,7 @@ brasero_medium_selection_changed (GtkComboBox *box)
* @selector: a #BraseroMediumSelection
* @medium: a #BraseroMedium to set as the active one in the selector
*
* Sets the active medium.
* Sets the active medium. Emits the ::medium-changed signal.
*
* Return value: a #gboolean. TRUE if it succeeded, FALSE otherwise.
**/
......@@ -240,10 +285,19 @@ gboolean
brasero_medium_selection_set_active (BraseroMediumSelection *selector,
BraseroMedium *medium)
{
BraseroMediumSelectionPrivate *priv;
gboolean result = FALSE;
GtkTreeModel *model;
GtkTreeIter iter;
g_return_val_if_fail (selector != NULL, FALSE);
g_return_val_if_fail (BRASERO_IS_MEDIUM_SELECTION (selector), FALSE);
priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
if (priv->active == medium)
return TRUE;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (selector));
if (!gtk_tree_model_get_iter_first (model, &iter))
return FALSE;
......@@ -260,6 +314,7 @@ brasero_medium_selection_set_active (BraseroMediumSelection *selector,
g_object_unref (iter_medium);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &iter);
brasero_medium_selection_set_current_medium (selector, &iter);
result = TRUE;
break;
}
......@@ -281,18 +336,16 @@ brasero_medium_selection_set_active (BraseroMediumSelection *selector,
BraseroMedium *
brasero_medium_selection_get_active (BraseroMediumSelection *selector)
{
BraseroMedium *medium;
GtkTreeModel *model;
GtkTreeIter iter;
BraseroMediumSelectionPrivate *priv;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (selector));
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (selector), &iter))
g_return_val_if_fail (selector != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_MEDIUM_SELECTION (selector), NULL);
priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
if (!priv->active)
return NULL;
gtk_tree_model_get (model, &iter,
MEDIUM_COL, &medium,
-1);
return medium;
return g_object_ref (priv->active);
}
static void
......@@ -322,8 +375,8 @@ brasero_medium_selection_update_no_disc_entry (BraseroMediumSelection *self,
g_object_unref (icon);
g_object_unref (monitor);
gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), iter);
brasero_medium_selection_set_current_medium (self, iter);
}
static void
......@@ -362,6 +415,9 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
GSList *list;
GSList *item;
g_return_if_fail (selector != NULL);
g_return_if_fail (BRASERO_IS_MEDIUM_SELECTION (selector));
priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
priv->type = type;
......@@ -392,17 +448,10 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
g_object_unref (medium);
if (!node) {
if (gtk_list_store_remove (GTK_LIST_STORE (model), &iter)) {
g_signal_emit (selector,
brasero_medium_selection_signals [REMOVED_SIGNAL],
0);
if (gtk_list_store_remove (GTK_LIST_STORE (model), &iter))
continue;
}
/* no more iter in the tree get out */
g_signal_emit (selector,
brasero_medium_selection_signals [REMOVED_SIGNAL],
0);
/* no more iter in the tree get out */
break;
}
......@@ -430,9 +479,6 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
ICON_COL, medium_icon,
-1);
g_free (medium_name);
g_signal_emit (selector,
brasero_medium_selection_signals [ADDED_SIGNAL],
0);
}
g_slist_foreach (list, (GFunc) g_object_unref, NULL);
g_slist_free (list);
......@@ -444,8 +490,10 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
}
gtk_widget_set_sensitive (GTK_WIDGET (selector), TRUE);
if (gtk_combo_box_get_active (GTK_COMBO_BOX (selector)) == -1)
if (gtk_combo_box_get_active (GTK_COMBO_BOX (selector)) == -1) {
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &iter);
brasero_medium_selection_set_current_medium (selector, &iter);
}
}
/**
......@@ -569,12 +617,10 @@ brasero_medium_selection_medium_added_cb (BraseroMediumMonitor *monitor,
g_free (medium_name);
gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
if (gtk_combo_box_get_active (GTK_COMBO_BOX (self)) == -1)
if (gtk_combo_box_get_active (GTK_COMBO_BOX (self)) == -1) {
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter);
g_signal_emit (self,
brasero_medium_selection_signals [ADDED_SIGNAL],
0);
brasero_medium_selection_set_current_medium (self, &iter);
}
}
static void
......@@ -599,9 +645,6 @@ brasero_medium_selection_medium_removed_cb (BraseroMediumMonitor *monitor,
if (medium == iter_medium) {
g_object_unref (iter_medium);
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
g_signal_emit (self,
brasero_medium_selection_signals [REMOVED_SIGNAL],
0);
break;
}
......@@ -616,8 +659,10 @@ brasero_medium_selection_medium_removed_cb (BraseroMediumMonitor *monitor,
return;
}
if (gtk_combo_box_get_active (GTK_COMBO_BOX (self)) == -1)
if (gtk_combo_box_get_active (GTK_COMBO_BOX (self)) == -1) {
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter);
brasero_medium_selection_set_current_medium (self, &iter);
}
}
static void
......@@ -743,7 +788,7 @@ brasero_medium_selection_get_property (GObject *object,
static void
brasero_medium_selection_class_init (BraseroMediumSelectionClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkComboBoxClass *combo_class = GTK_COMBO_BOX_CLASS (klass);
g_type_class_add_private (klass, sizeof (BraseroMediumSelectionPrivate));
......@@ -763,27 +808,17 @@ brasero_medium_selection_class_init (BraseroMediumSelectionClass *klass)
0, BRASERO_MEDIA_TYPE_ALL,
BRASERO_MEDIA_TYPE_NONE,
G_PARAM_READWRITE));
brasero_medium_selection_signals [ADDED_SIGNAL] =
g_signal_new ("medium_added",
BRASERO_TYPE_MEDIUM_SELECTION,
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION|G_SIGNAL_NO_RECURSE,
0,
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
brasero_medium_selection_signals [REMOVED_SIGNAL] =
g_signal_new ("medium_removed",
brasero_medium_selection_signals [CHANGED_SIGNAL] =
g_signal_new ("medium_changed",
BRASERO_TYPE_MEDIUM_SELECTION,
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION|G_SIGNAL_NO_RECURSE,
0,
G_STRUCT_OFFSET (BraseroMediumSelectionClass, medium_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
0);
1,
BRASERO_TYPE_MEDIUM);
}
GtkWidget *
......
......@@ -47,6 +47,10 @@ struct _BraseroMediumSelectionClass
{
GtkComboBoxClass parent_class;
/* Signals */
void (* medium_changed) (BraseroMediumSelection *selection,
BraseroMedium *medium);
/* virtual function */
gchar * (*format_medium_string) (BraseroMediumSelection *selection,
BraseroMedium *medium);
......
......@@ -243,6 +243,9 @@ brasero_medium_get_tooltip (BraseroMedium *self)
gchar *label;
gchar *name;
g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_MEDIUM (self), NULL);
priv = BRASERO_MEDIUM_PRIVATE (self);
media = brasero_medium_get_status (BRASERO_MEDIUM (self));
......
......@@ -26,7 +26,7 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <brasero-drive.h>
#include <brasero/brasero-drive.h>
G_BEGIN_DECLS
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment