[meego-commits] 5913: Changes to Trunk:Netbook/gnome-media
Zhang Qiang
qiang.z.zhang at intel.com
Thu Jul 22 03:49:52 UTC 2010
Hi,
I have made the following changes to gnome-media in project Trunk:Netbook. Please review and accept ASAP.
Thank You,
Zhang Qiang
[This message was auto-generated]
---
Request #5913:
submit: home:xiaoqiang:branches:Trunk:Netbook/gnome-media(r2)(cleanup) -> Trunk:Netbook/gnome-media
Message:
Sync with MeeGo 1.1 updates:Fix i18n in the capplet (MBC#1660)
State: new 2010-07-21T15:43:46 xiaoqiang
Comment: None
changes files:
--------------
--- gnome-media.changes
+++ gnome-media.changes
@@ -0,0 +1,4 @@
+* Thu Jul 22 2010 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.0
+- Fix i18n in the capplet (MBC#1660)
+- Sync with MeeGo 1.1 updates
+
spec files:
-----------
other changes:
--------------
++++++ volume-control-panel.patch
--- volume-control-panel.patch
+++ volume-control-panel.patch
@@ -1,7 +1,8 @@
-diff -Nur a/configure.ac b/configure.ac
---- a/configure.ac 2010-02-23 06:20:26.000000000 +0800
-+++ b/configure.ac 2010-03-19 10:37:19.413204399 +0800
-@@ -117,10 +117,14 @@
+diff --git a/configure.ac b/configure.ac
+index 7533e5e..f5b6953 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,10 +117,14 @@ if test "x$enable_pulseaudio" != "xno"; then
libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
unique-1.0
libxml-2.0
@@ -16,10 +17,76 @@
fi
else
have_pulseaudio=no
-diff -ruN a/gnome-volume-control/src/cc-volume-control.c b/gnome-volume-control/src/cc-volume-control.c
---- a/gnome-volume-control/src/cc-volume-control.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/gnome-volume-control/src/cc-volume-control.c 2010-03-16 14:33:53.000000000 +0000
-@@ -0,0 +1,193 @@
+diff --git a/gnome-volume-control/src/Makefile.am b/gnome-volume-control/src/Makefile.am
+index 21462af..d95e90c 100644
+--- a/gnome-volume-control/src/Makefile.am
++++ b/gnome-volume-control/src/Makefile.am
+@@ -2,7 +2,6 @@ NULL =
+
+ bin_PROGRAMS = \
+ gnome-volume-control-applet \
+- gnome-volume-control \
+ $(NULL)
+
+ AM_CPPFLAGS = \
+@@ -57,7 +56,30 @@ gnome_volume_control_applet_SOURCES = \
+ applet-main.c \
+ $(NULL)
+
+-gnome_volume_control_LDADD = \
++#gnome_volume_control_LDADD = \
++# -lm \
++# libgnomevolumecontrol.la \
++# $(top_builddir)/sound-theme/libsoundtheme.la \
++# $(VOLUME_CONTROL_LIBS) \
++# $(PULSEAUDIO_LIBS) \
++# $(NULL)
++
++#gnome_volume_control_SOURCES = \
++# gvc-balance-bar.h \
++# gvc-balance-bar.c \
++# gvc-mixer-dialog.h \
++# gvc-mixer-dialog.c \
++# gvc-level-bar.h \
++# gvc-level-bar.c \
++# gvc-combo-box.h \
++# gvc-combo-box.c \
++# dialog-main.c \
++# $(NULL)
++
++ccmodulesdir = $(EXTENSIONSDIR)
++ccmodules_LTLIBRARIES = libvolumecontrol.la
++
++libvolumecontrol_la_LIBADD = \
+ -lm \
+ libgnomevolumecontrol.la \
+ $(top_builddir)/sound-theme/libsoundtheme.la \
+@@ -65,7 +87,10 @@ gnome_volume_control_LDADD = \
+ $(PULSEAUDIO_LIBS) \
+ $(NULL)
+
+-gnome_volume_control_SOURCES = \
++libvolumecontrol_la_SOURCES = \
++ cc-volume-control.c \
++ cc-volume-control.h \
++ cc-volume-module.c \
+ gvc-balance-bar.h \
+ gvc-balance-bar.c \
+ gvc-mixer-dialog.h \
+@@ -74,7 +99,6 @@ gnome_volume_control_SOURCES = \
+ gvc-level-bar.c \
+ gvc-combo-box.h \
+ gvc-combo-box.c \
+- dialog-main.c \
+ $(NULL)
+
+ BUILT_SOURCES = \
+diff --git a/gnome-volume-control/src/cc-volume-control.c b/gnome-volume-control/src/cc-volume-control.c
+new file mode 100644
+index 0000000..d1afab8
+--- /dev/null
++++ b/gnome-volume-control/src/cc-volume-control.c
+@@ -0,0 +1,195 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
@@ -43,12 +110,14 @@
+ *
+ */
+
++#include <config.h>
++
+#include "cc-volume-control.h"
+
+#include "gvc-mixer-control.h"
+#include "gvc-mixer-dialog.h"
+
-+#include <glib/gi18n.h>
++#include <glib/gi18n-lib.h>
+
+G_DEFINE_DYNAMIC_TYPE (CcVolumePanel, cc_volume_panel, CC_TYPE_PANEL)
+
@@ -213,83 +282,11 @@
+ "volume",
+ 10);
+}
-diff -Nur a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
---- a/gnome-volume-control/src/gvc-mixer-dialog.c 2010-02-23 06:20:26.000000000 +0800
-+++ b/gnome-volume-control/src/gvc-mixer-dialog.c 2010-03-22 13:00:53.173089668 +0800
-@@ -1940,7 +1940,6 @@
- G_CALLBACK (on_control_card_removed),
- self);
-
-- gtk_widget_show_all (main_vbox);
-
- streams = gvc_mixer_control_get_streams (self->priv->mixer_control);
- for (l = streams; l != NULL; l = l->next) {
-diff -Nur a/gnome-volume-control/src/Makefile.am b/gnome-volume-control/src/Makefile.am
---- a/gnome-volume-control/src/Makefile.am 2010-02-23 06:20:26.000000000 +0800
-+++ b/gnome-volume-control/src/Makefile.am 2010-03-22 13:09:50.719091618 +0800
-@@ -2,7 +2,6 @@
-
- bin_PROGRAMS = \
- gnome-volume-control-applet \
-- gnome-volume-control \
- $(NULL)
-
- AM_CPPFLAGS = \
-@@ -57,7 +56,30 @@
- applet-main.c \
- $(NULL)
-
--gnome_volume_control_LDADD = \
-+#gnome_volume_control_LDADD = \
-+# -lm \
-+# libgnomevolumecontrol.la \
-+# $(top_builddir)/sound-theme/libsoundtheme.la \
-+# $(VOLUME_CONTROL_LIBS) \
-+# $(PULSEAUDIO_LIBS) \
-+# $(NULL)
-+
-+#gnome_volume_control_SOURCES = \
-+# gvc-balance-bar.h \
-+# gvc-balance-bar.c \
-+# gvc-mixer-dialog.h \
-+# gvc-mixer-dialog.c \
-+# gvc-level-bar.h \
-+# gvc-level-bar.c \
-+# gvc-combo-box.h \
-+# gvc-combo-box.c \
-+# dialog-main.c \
-+# $(NULL)
-+
-+ccmodulesdir = $(EXTENSIONSDIR)
-+ccmodules_LTLIBRARIES = libvolumecontrol.la
-+
-+libvolumecontrol_la_LIBADD = \
- -lm \
- libgnomevolumecontrol.la \
- $(top_builddir)/sound-theme/libsoundtheme.la \
-@@ -65,7 +87,10 @@
- $(PULSEAUDIO_LIBS) \
- $(NULL)
-
--gnome_volume_control_SOURCES = \
-+libvolumecontrol_la_SOURCES = \
-+ cc-volume-control.c \
-+ cc-volume-control.h \
-+ cc-volume-module.c \
- gvc-balance-bar.h \
- gvc-balance-bar.c \
- gvc-mixer-dialog.h \
-@@ -74,7 +99,6 @@
- gvc-level-bar.c \
- gvc-combo-box.h \
- gvc-combo-box.c \
-- dialog-main.c \
- $(NULL)
-
- BUILT_SOURCES = \
-diff -ruN a/gnome-volume-control/src/cc-volume-control.h b/gnome-volume-control/src/cc-volume-control.h
---- a/gnome-volume-control/src/cc-volume-control.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/gnome-volume-control/src/cc-volume-control.h 2010-03-16 13:42:26.000000000 +0000
+diff --git a/gnome-volume-control/src/cc-volume-control.h b/gnome-volume-control/src/cc-volume-control.h
+new file mode 100644
+index 0000000..3102f5a
+--- /dev/null
++++ b/gnome-volume-control/src/cc-volume-control.h
@@ -0,0 +1,77 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
(268 more lines skipped)
More information about the MeeGo-commits
mailing list