File sound-juicer-g3.patch of Package sound-juicer
commit a362297f7faa7b88a3cb412ebfd3b47dd0414183
Author: Matthias Clasen <mclasen@redhat.com>
Date: Fri Oct 1 11:03:30 2010 -0400
Use new GDK key names
This fixes the build against GTK3 (and works with 2.22 as well).
This commit does not make the chances to configure.in to actually
build against GTK3, though.
https://bugzilla.gnome.org/show_bug.cgi?id=630868
diff --git a/src/sj-main.c b/src/sj-main.c
index 43f1a6f..351fb66 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -113,7 +113,7 @@ sj_stock_init (void)
static const GtkStockItem sj_stock_items[] =
{
- { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_Return, NULL }
+ { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_KEY_Return, NULL }
};
if (initialized)
commit 83398a1e2d1f1045353884b44c681e035b561023
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon Nov 15 17:43:37 2010 +0000
build: Remove ability to build against GTK+ 2.x
diff --git a/configure.in b/configure.in
index 8727f14..9e5f0c8 100644
--- a/configure.in
+++ b/configure.in
@@ -34,30 +34,7 @@ GNOME_CXX_WARNINGS
GNOME_DEBUG_CHECK
GNOME_MAINTAINER_MODE_DEFINES
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
- [case "$with_gtk" in
- 2.0|3.0) ;;
- *) AC_MSG_ERROR([invalid gtk version specified]) ;;
- esac],
- [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
- 2.0) GTK_API_VERSION=2.0
- GTK_REQUIRED=2.20.0
- LIBBRASERO_MEDIA_PC="libbrasero-media >= 2.26"
- LIBCANBERRA_GTK_PC=libcanberra-gtk
- GNOME_MEDIA_PROFILES_PC="gnome-media-profiles >= 2.11.91"
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=2.90.0
- LIBBRASERO_MEDIA_PC=libbrasero-media3
- LIBCANBERRA_GTK_PC=libcanberra-gtk3
- GNOME_MEDIA_PROFILES_PC=gnome-media-profiles-3.0
- ;;
-esac
+GTK_REQUIRED=2.90.0
AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
@@ -70,7 +47,7 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
# Find libbrasero-media
-PKG_CHECK_MODULES(BURN, $LIBBRASERO_MEDIA_PC)
+PKG_CHECK_MODULES(BURN, libbrasero-media3)
AC_SUBST(BURN_CFLAGS)
AC_SUBST(BURN_LIBS)
@@ -81,7 +58,7 @@ LIBS="$LIBS $BURN_LIBS"
# LIBS="$oldlibs"
# Find the UI libraries
-PKG_CHECK_MODULES(UI, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 $LIBCANBERRA_GTK_PC)
+PKG_CHECK_MODULES(UI, gtk+-3.0 >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 libcanberra-gtk3)
AC_SUBST(UI_CFLAGS)
AC_SUBST(UI_LIBS)
@@ -96,7 +73,7 @@ AM_GST_ELEMENT_CHECK(wavenc,,AC_MSG_WARN([The 'wavenc' element was not found. Th
AM_GST_ELEMENT_CHECK(giosink,,AC_MSG_WARN([The 'giosink' element was not found. This will cause Sound Juicer to fail at runtime.]))
# Find GNOME Media Profiles
-PKG_CHECK_MODULES(MEDIA_PROFILES, $GNOME_MEDIA_PROFILES_PC)
+PKG_CHECK_MODULES(MEDIA_PROFILES, libgnome-media-profiles-3.0)
AC_SUBST(MEDIA_PROFILES_CFLAGS)
AC_SUBST(MEDIA_PROFILES_LIBS)
commit f23bb0a5aac613c385272ee448afd27ce50b9ee4
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon Nov 15 17:47:54 2010 +0000
Update for new GTK+ 3.x and libgnome-media-profiles
diff --git a/data/sound-juicer.ui b/data/sound-juicer.ui
index 12de20c..50042c7 100644
--- a/data/sound-juicer.ui
+++ b/data/sound-juicer.ui
@@ -615,7 +615,6 @@ audio-volume-medium</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Multiple Albums Found</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -735,7 +734,6 @@ audio-volume-medium</property>
<property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
diff --git a/libjuicer/sj-extractor.c b/libjuicer/sj-extractor.c
index dab6ec0..52f80d2 100644
--- a/libjuicer/sj-extractor.c
+++ b/libjuicer/sj-extractor.c
@@ -30,7 +30,7 @@
#include <glib-object.h>
#include <gst/gst.h>
#include <gst/tag/tag.h>
-#include <profiles/gnome-media-profiles.h>
+#include <libgnome-media-profiles/gnome-media-profiles.h>
#include "sj-extractor.h"
#include "sj-structures.h"
#include "sj-error.h"
diff --git a/libjuicer/sj-extractor.h b/libjuicer/sj-extractor.h
index d9d8717..bbe23fc 100644
--- a/libjuicer/sj-extractor.h
+++ b/libjuicer/sj-extractor.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gio/gio.h>
-#include <profiles/audio-profile.h>
+#include <libgnome-media-profiles/audio-profile.h>
#include "sj-structures.h"
G_BEGIN_DECLS
diff --git a/src/sj-main.c b/src/sj-main.c
index 351fb66..f9d3d71 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -33,7 +33,7 @@
#include <gconf/gconf-client.h>
#include <brasero-medium-selection.h>
#include <brasero-volume.h>
-#include <profiles/gnome-media-profiles.h>
+#include <libgnome-media-profiles/gnome-media-profiles.h>
#include <gst/gst.h>
#include "bacon-message-connection.h"
@@ -886,10 +886,10 @@ static void reread_cd (gboolean ignore_no_media)
/* Set watch cursor */
if (realized) {
- cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (window), GDK_WATCH);
+ cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_WATCH);
gdk_window_set_cursor (window, cursor);
gdk_cursor_unref (cursor);
- gdk_display_sync (gdk_drawable_get_display (window));
+ gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (window)));
}
/* Set statusbar message */
diff --git a/src/sj-prefs.c b/src/sj-prefs.c
index 698b4aa..aeb2bc5 100644
--- a/src/sj-prefs.c
+++ b/src/sj-prefs.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
-#include <profiles/gnome-media-profiles.h>
+#include <libgnome-media-profiles/gnome-media-profiles.h>
#include <brasero-drive-selection.h>
#include "sj-util.h"
commit ed3f4cb76613a8345cc7aa8ba6d1f6b311500788
Author: Bastien Nocera <hadess@hadess.net>
Date: Sat Feb 5 14:45:35 2011 +0000
libjuicer: Remove unused variable
diff --git a/libjuicer/sj-metadata.c b/libjuicer/sj-metadata.c
index ce82fc5..797c9ff 100644
--- a/libjuicer/sj-metadata.c
+++ b/libjuicer/sj-metadata.c
@@ -199,10 +199,9 @@ sj_metadata_helper_check_media (const char *cdrom, GError **error)
return FALSE;
}
#else
- TotemDiscMediaType type;
GError *totem_error = NULL;
- type = totem_cd_detect_type (cdrom, &totem_error);
+ totem_cd_detect_type (cdrom, &totem_error);
if (totem_error != NULL) {
g_set_error (error, SJ_ERROR, SJ_ERROR_CD_NO_MEDIA, _("Cannot read CD: %s"), totem_error->message);
commit b67f8c8bd310ca927d468508244205dc090f126a
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:39:39 2011 +0100
sj-play: Remove unused variables
diff --git a/configure.in b/configure.in
index 9e5f0c8..70406d3 100644
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,7 @@ PKG_CHECK_MODULES(MEDIA_PROFILES, libgnome-media-profiles-3.0)
AC_SUBST(MEDIA_PROFILES_CFLAGS)
AC_SUBST(MEDIA_PROFILES_LIBS)
-# Find optional MusicBrainz3 and required Musicbrainz2
+# Find required MusicBrainz3
PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3 >= 3.0.2, [have_mb3=yes], [have_mb3=no])
AC_SUBST(MUSICBRAINZ3_CFLAGS)
AC_SUBST(MUSICBRAINZ3_LIBS)
diff --git a/src/sj-play.c b/src/sj-play.c
index a0e19f3..b6006f6 100644
--- a/src/sj-play.c
+++ b/src/sj-play.c
@@ -49,7 +49,6 @@ static gboolean
select_track (void)
{
GstStateChangeReturn ret;
- GstElement *cd;
if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (track_store),
¤t_iter, NULL, seek_to_track)) {
@@ -57,8 +56,6 @@ select_track (void)
return FALSE;
}
- cd = gst_bin_get_by_name_recurse_up (GST_BIN (pipeline), "cd-source");
-
ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
if (ret == GST_STATE_CHANGE_FAILURE) {
return FALSE;
@@ -509,11 +506,10 @@ G_MODULE_EXPORT void
on_previous_track_activate(GtkWidget *button, gpointer data)
{
GtkTreeModel *model;
- gint tracks, prev_track = current_track - 1;
+ gint prev_track = current_track - 1;
GtkTreeIter prev_iter;
model = GTK_TREE_MODEL (track_store);
- tracks = gtk_tree_model_iter_n_children (model, NULL);
while (prev_track >= 0) {
gboolean do_play;
@@ -623,9 +619,7 @@ G_MODULE_EXPORT gboolean
on_seek_release (GtkWidget * scale, GdkEventButton * event, gpointer user_data)
{
gdouble val = gtk_range_get_value (GTK_RANGE (scale));
- GstElement *cd;
- cd = gst_bin_get_by_name_recurse_up (GST_BIN (pipeline), "cd-source");
seeking = FALSE;
gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, slen * val, GST_SEEK_TYPE_NONE, -1);
commit b3a3bd265ecd9577889f10114962b1bd0bb08fa3
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:43:31 2011 +0100
sj-extracting: Fix warning about OverwriteDialogResponse
diff --git a/src/sj-extracting.c b/src/sj-extracting.c
index 10c81f7..27cc4d4 100644
--- a/src/sj-extracting.c
+++ b/src/sj-extracting.c
@@ -64,6 +64,7 @@ typedef enum {
BUTTON_SKIP_ALL = 2,
BUTTON_OVERWRITE = 3,
BUTTON_OVERWRITE_ALL = 4,
+ BUTTON_DELETE_EVENT = GTK_RESPONSE_DELETE_EVENT,
} OverwriteDialogResponse;
/* files smaller than this are assumed to be corrupt */
@@ -336,7 +337,7 @@ confirm_overwrite_existing_file (GFile *uri, int *overwrite_mode, goffset info_s
return FALSE;
break;
case BUTTON_SKIP:
- case GTK_RESPONSE_DELETE_EVENT:
+ case BUTTON_DELETE_EVENT:
default:
return FALSE;
break;
commit da990f52ee21d7aa8af8169103d8616bfbcb8f0b
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:49:37 2011 +0100
sj-main: Fix use of unset variable
And fix a possible crasher by the same token.
diff --git a/src/sj-main.c b/src/sj-main.c
index f9d3d71..d8f6c8d 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -410,9 +410,11 @@ musicbrainz_submit_info_bar_new (char *title, char *artist)
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (artist != NULL, NULL);
- infobar = gtk_info_bar_new_with_buttons (_("S_ubmit Album"), GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
+ infobar = gtk_info_bar_new ();
+ button = gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
+ _("S_ubmit Album"), GTK_RESPONSE_OK);
+ gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
/* Translators: title, artist */
primary_text = g_strdup_printf (_("Could not find %s by %s on MusicBrainz."), title, artist);
commit 8d7c422323e3cdcf520a13b6b5ccb6194591d814
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:50:25 2011 +0100
egg-play-preview: Remove unused variable
diff --git a/src/egg-play-preview.c b/src/egg-play-preview.c
index 720f05a..004a6f3 100644
--- a/src/egg-play-preview.c
+++ b/src/egg-play-preview.c
@@ -377,10 +377,8 @@ egg_play_preview_get_property (GObject *object,
GParamSpec *pspec)
{
EggPlayPreview *play_preview;
- EggPlayPreviewPrivate *priv;
play_preview = EGG_PLAY_PREVIEW (object);
- priv = GET_PRIVATE (play_preview);
switch (prop_id) {
case PROP_URI:
commit 87e34e7eb175dbdc733972753b72c636dd2b3b77
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:59:48 2011 +0100
data: Fix packing in the main UI
diff --git a/data/sound-juicer.ui b/data/sound-juicer.ui
index 50042c7..3704ab3 100644
--- a/data/sound-juicer.ui
+++ b/data/sound-juicer.ui
@@ -322,6 +322,8 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
commit d548a011e33963ed32e854ad9d2b54c62a19863f
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon May 23 13:59:59 2011 +0100
build: quiet down
diff --git a/data/Makefile.am b/data/Makefile.am
index 8f70ee9..b2a3f58 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -57,7 +57,7 @@ uninstall-icons:
install-data-local: install-icons
if GCONF_SCHEMAS_INSTALL
- if test -z "$(DESTDIR)" ; then \
+ @if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
done \
