gnome-media r4043 - in trunk: . gst-mixer/src profiles profiles/glade
- From: kmaraas svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-media r4043 - in trunk: . gst-mixer/src profiles profiles/glade
- Date: Sat, 8 Nov 2008 11:41:32 +0000 (UTC)
Author: kmaraas
Date: Sat Nov 8 11:41:32 2008
New Revision: 4043
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4043&view=rev
Log:
2008-11-08 Kjartan Maraas <kmaraas gnome org>
* gst-mixer/src/button.c: (gnome_volume_control_button_class_init),
(gnome_volume_control_button_dispose):
* gst-mixer/src/element.c: (gnome_volume_control_element_change):
* gst-mixer/src/main.c: (main):
* gst-mixer/src/misc.c:
* gst-mixer/src/preferences.c: (cb_toggle):
* gst-mixer/src/track.c: (gnome_volume_control_track_add_playback):
* gst-mixer/src/volume.c: (gnome_volume_control_volume_new),
(gnome_volume_control_volume_size_req),
(gnome_volume_control_volume_size_alloc):
* gst-mixer/src/window.c: (gnome_volume_control_window_dispose),
(gnome_volume_control_window_new):
* profiles/audio-profile-edit.c:
* profiles/audio-profiles-edit.c: (gm_audio_profiles_edit_init):
* profiles/glade/gnome-media-profiles-glade.c:
(glade_module_register_widgets):
* profiles/gmp-util.c: (gmp_util_run_error_dialog):
* profiles/gnome-audio-profiles-properties.c:
* profiles/gnome-audio-profiles-test.c: (main):
* profiles/gnome-media-profiles.c:
General cleanups: Remove unused variables, mark code static, add
missing prototypes and includes etc. Bug #552748.
Modified:
trunk/ChangeLog
trunk/gst-mixer/src/button.c
trunk/gst-mixer/src/element.c
trunk/gst-mixer/src/main.c
trunk/gst-mixer/src/misc.c
trunk/gst-mixer/src/preferences.c
trunk/gst-mixer/src/track.c
trunk/gst-mixer/src/volume.c
trunk/gst-mixer/src/window.c
trunk/profiles/audio-profile-edit.c
trunk/profiles/audio-profiles-edit.c
trunk/profiles/glade/gnome-media-profiles-glade.c
trunk/profiles/gmp-util.c
trunk/profiles/gnome-audio-profiles-properties.c
trunk/profiles/gnome-audio-profiles-test.c
trunk/profiles/gnome-media-profiles.c
Modified: trunk/gst-mixer/src/button.c
==============================================================================
--- trunk/gst-mixer/src/button.c (original)
+++ trunk/gst-mixer/src/button.c Sat Nov 8 11:41:32 2008
@@ -38,18 +38,11 @@
static void gnome_volume_control_button_clicked (GtkButton *button);
-static gboolean gnome_volume_control_button_mouseover (GtkWidget *widget,
- GdkEventCrossing *event);
-static gboolean gnome_volume_control_button_mouseout (GtkWidget *widget,
- GdkEventCrossing *event);
-
-
static void
gnome_volume_control_button_class_init (GnomeVolumeControlButtonClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkButtonClass *gtkbutton_class = GTK_BUTTON_CLASS (klass);
- GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass);
gobject_class->dispose = gnome_volume_control_button_dispose;
gtkbutton_class->clicked = gnome_volume_control_button_clicked;
@@ -67,8 +60,6 @@
static void
gnome_volume_control_button_dispose (GObject *object)
{
- GnomeVolumeControlButton *button = GNOME_VOLUME_CONTROL_BUTTON (object);
-
G_OBJECT_CLASS (gnome_volume_control_button_parent_class)->dispose (object);
}
Modified: trunk/gst-mixer/src/element.c
==============================================================================
--- trunk/gst-mixer/src/element.c (original)
+++ trunk/gst-mixer/src/element.c Sat Nov 8 11:41:32 2008
@@ -275,7 +275,6 @@
for (item = gst_mixer_list_tracks (el->mixer);
item != NULL; item = item->next) {
GstMixerTrack *track = item->data;
- GtkWidget *trackw;
GnomeVolumeControlTrack *trkw;
gchar *key;
const GConfValue *value;
Modified: trunk/gst-mixer/src/main.c
==============================================================================
--- trunk/gst-mixer/src/main.c (original)
+++ trunk/gst-mixer/src/main.c Sat Nov 8 11:41:32 2008
@@ -116,7 +116,7 @@
gtk_main_quit ();
}
-void
+static void
cb_check_resize (GtkContainer *container,
gpointer user_data)
{
@@ -134,8 +134,6 @@
gchar *argv[])
{
GOptionContext *ctx;
- GOptionGroup *group;
- gchar *appfile;
GtkWidget *win;
GList *elements;
Modified: trunk/gst-mixer/src/misc.c
==============================================================================
--- trunk/gst-mixer/src/misc.c (original)
+++ trunk/gst-mixer/src/misc.c Sat Nov 8 11:41:32 2008
@@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
+#include "misc.h"
+
#include <gst/interfaces/mixer.h>
#include <gst/interfaces/mixertrack.h>
#include <gst/interfaces/mixeroptions.h>
Modified: trunk/gst-mixer/src/preferences.c
==============================================================================
--- trunk/gst-mixer/src/preferences.c (original)
+++ trunk/gst-mixer/src/preferences.c Sat Nov 8 11:41:32 2008
@@ -417,7 +417,6 @@
GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
GtkTreeIter iter;
gboolean active;
- gchar *key;
GstMixerTrack *track;
gtk_tree_model_get_iter (model, &iter, path);
Modified: trunk/gst-mixer/src/track.c
==============================================================================
--- trunk/gst-mixer/src/track.c (original)
+++ trunk/gst-mixer/src/track.c Sat Nov 8 11:41:32 2008
@@ -334,11 +334,6 @@
GtkWidget *r_sep)
{
GnomeVolumeControlTrack *ctrl;
- GtkWidget *slider;
- gint i, *volumes;
- GtkObject *adj;
- AtkObject *accessible;
- gchar *accessible_name;
/* image, title */
ctrl = gnome_volume_control_track_add_title (table, tab_pos,
Modified: trunk/gst-mixer/src/volume.c
==============================================================================
--- trunk/gst-mixer/src/volume.c (original)
+++ trunk/gst-mixer/src/volume.c Sat Nov 8 11:41:32 2008
@@ -164,7 +164,6 @@
GnomeVolumeControlVolume *vol;
gint *volumes, n;
gchar *msg, *chan;
- GList *items;
gboolean need_timeout = TRUE;
need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (mixer)) &
@@ -278,7 +277,6 @@
{
GnomeVolumeControlVolume *vol = GNOME_VOLUME_CONTROL_VOLUME (widget);
GtkRequisition but_req, scale_req;
- gint w,h;
/* request size of kids */
GTK_WIDGET_GET_CLASS (vol->button)->size_request (vol->button, &but_req);
@@ -300,7 +298,7 @@
GnomeVolumeControlVolume *vol = GNOME_VOLUME_CONTROL_VOLUME (widget);
GtkRequisition but_req, scale_req;
GtkAllocation but_all, scale_all;
- gint x_offset, but_deco_y_offset, but_x_offset, but_deco_width, n = 0;
+ gint x_offset, but_deco_width, n = 0;
GList *scales;
/* loop? */
Modified: trunk/gst-mixer/src/window.c
==============================================================================
--- trunk/gst-mixer/src/window.c (original)
+++ trunk/gst-mixer/src/window.c Sat Nov 8 11:41:32 2008
@@ -113,7 +113,7 @@
if (gdk_spawn_command_line_on_screen (screen, cmdline, &error) == FALSE) {
dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, error->message);
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
g_error_free(error);
@@ -242,7 +242,6 @@
/* clean up */
if (win->elements) {
- const GList *item;
g_list_foreach (win->elements, (GFunc) g_object_unref, NULL);
g_list_free (win->elements);
@@ -308,8 +307,6 @@
GtkWidget *closebtn;
GtkWidget *helpbtn;
gint count = 0;
- gchar *title;
- GtkActionGroup *action_group;
GtkWidget *vbox;
GtkCellRenderer *renderer;
gint active_element_num;
@@ -331,7 +328,7 @@
active_el_str = gconf_client_get_string (win->client,
GNOME_VOLUME_CONTROL_KEY_ACTIVE_ELEMENT,
NULL);
- if (active_el_str != NULL && active_el_str != '\0') {
+ if (active_el_str != NULL && *active_el_str != '\0') {
for (count = 0, item = elements; item != NULL; item = item->next, count++) {
cur_el_str = g_object_get_data (item->data, "gnome-volume-control-name");
if (cur_el_str == NULL)
@@ -371,7 +368,6 @@
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box), renderer, "text", 0);
for (count = 0, item = elements; item != NULL; item = item->next, count++) {
const gchar *name;
- gchar *label;
name = g_object_get_data (item->data, "gnome-volume-control-name");
gtk_combo_box_append_text(GTK_COMBO_BOX (combo_box), name);
Modified: trunk/profiles/audio-profile-edit.c
==============================================================================
--- trunk/profiles/audio-profile-edit.c (original)
+++ trunk/profiles/audio-profile-edit.c Sat Nov 8 11:41:32 2008
@@ -91,6 +91,7 @@
g_type_class_add_private (object_class, sizeof (GMAudioProfileEditPrivate));
}
+#if 0
static void
gm_audio_profile_edit_finalize (GObject *object)
{
@@ -100,6 +101,7 @@
G_OBJECT_CLASS (gm_audio_profile_edit_parent_class)->finalize (object);
}
+#endif
/* ui callbacks */
static void
Modified: trunk/profiles/audio-profiles-edit.c
==============================================================================
--- trunk/profiles/audio-profiles-edit.c (original)
+++ trunk/profiles/audio-profiles-edit.c Sat Nov 8 11:41:32 2008
@@ -34,6 +34,7 @@
#include "audio-profile-private.h"
#include "gmp-util.h"
#include "audio-profiles-edit.h"
+#include <libgnomeui/libgnomeui.h>
#define MANAGE_STOCK_EDIT "manage-edit"
@@ -581,8 +582,6 @@
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *button;
- GtkWidget *spacer;
- GtkRequisition req;
GtkTreeSelection *selection;
/*
Modified: trunk/profiles/glade/gnome-media-profiles-glade.c
==============================================================================
--- trunk/profiles/glade/gnome-media-profiles-glade.c (original)
+++ trunk/profiles/glade/gnome-media-profiles-glade.c Sat Nov 8 11:41:32 2008
@@ -20,7 +20,7 @@
void
glade_module_register_widgets (void)
{
- gm_audio_profile_edit_get_type ();
+ /* FIXME: Why is this here? gm_audio_profile_edit_get_type (); */
glade_register_widget (GM_AUDIO_TYPE_PROFILE_EDIT,
gm_audio_profile_edit_new_2,
NULL, NULL);
Modified: trunk/profiles/gmp-util.c
==============================================================================
--- trunk/profiles/gmp-util.c (original)
+++ trunk/profiles/gmp-util.c Sat Nov 8 11:41:32 2008
@@ -92,11 +92,12 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
+ "%s",
message);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy(GTK_DIALOG (dialog));
+ gtk_widget_destroy(GTK_WIDGET (dialog));
}
/**
@@ -137,6 +138,7 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
+ "%s",
message);
g_signal_connect (G_OBJECT (dialog), "response",
Modified: trunk/profiles/gnome-audio-profiles-properties.c
==============================================================================
--- trunk/profiles/gnome-audio-profiles-properties.c (original)
+++ trunk/profiles/gnome-audio-profiles-properties.c Sat Nov 8 11:41:32 2008
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <libintl.h>
#include <gtk/gtkmain.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-ui-init.h>
Modified: trunk/profiles/gnome-audio-profiles-test.c
==============================================================================
--- trunk/profiles/gnome-audio-profiles-test.c (original)
+++ trunk/profiles/gnome-audio-profiles-test.c Sat Nov 8 11:41:32 2008
@@ -148,11 +148,12 @@
{
GtkWidget *window, *hbox, *combo, *edit, *test;
GConfClient *gconf;
+ GnomeProgram *program;
gst_init (&argc, &argv);
- gnome_program_init ("gnome-audio-profiles-test", VERSION,
- LIBGNOMEUI_MODULE, argc, argv,
- NULL);
+ program = gnome_program_init ("gnome-audio-profiles-test", VERSION,
+ LIBGNOMEUI_MODULE, argc, argv,
+ NULL);
gconf = gconf_client_get_default ();
gnome_media_profiles_init (gconf);
@@ -174,5 +175,7 @@
gtk_widget_show_all (window);
gtk_main ();
+ g_object_unref (program);
+
return 0;
}
Modified: trunk/profiles/gnome-media-profiles.c
==============================================================================
--- trunk/profiles/gnome-media-profiles.c (original)
+++ trunk/profiles/gnome-media-profiles.c Sat Nov 8 11:41:32 2008
@@ -23,6 +23,8 @@
#include <config.h>
#endif
+#include "gnome-media-profiles.h"
+
#include <glade/glade.h>
#include <glade/glade-build.h>
#include <string.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
