[Pkg-telepathy-commits] ./packages/unstable/empathy r117: Add patch to remove unused code which breaks compilation with gcc 4.3
Sjoerd Simons
sjoerd at luon.net
Fri May 2 07:48:26 UTC 2008
------------------------------------------------------------
revno: 117
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Fri 2008-04-04 20:46:05 +0200
message:
Add patch to remove unused code which breaks compilation with gcc 4.3
added:
patches/01_remove_unused_code.patch
modified:
changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog 2008-04-04 17:19:15 +0000
+++ b/changelog 2008-04-04 18:46:05 +0000
@@ -6,8 +6,11 @@
* debian/patches/00_fix_python_bindings.patch:
+ Added. Don't try to import objects that don't exist anymore (from
upstream git) (Closes: #474260)
+ * debian/patches/01_remove_unused_code.patch:
+ + Added. Remove unused code. Fixes compilation errors with Gcc 4.3
+ (Closes: #466817)
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 04 Apr 2008 19:02:18 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 04 Apr 2008 20:44:46 +0200
empathy (0.22.0-1) unstable; urgency=low
=== added file 'patches/01_remove_unused_code.patch'
--- a/patches/01_remove_unused_code.patch 1970-01-01 00:00:00 +0000
+++ b/patches/01_remove_unused_code.patch 2008-04-04 18:46:05 +0000
@@ -0,0 +1,179 @@
+diff --git a/libempathy-gtk/empathy-preferences.c b/libempathy-gtk/empathy-preferences.c
+index 50c9d56..6755ab5 100644
+--- a/libempathy-gtk/empathy-preferences.c
++++ b/libempathy-gtk/empathy-preferences.c
+@@ -82,15 +82,10 @@ static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle
+ static void preferences_themes_setup (EmpathyPreferences *preferences);
+ static void preferences_widget_sync_bool (const gchar *key,
+ GtkWidget *widget);
+-static void preferences_widget_sync_int (const gchar *key,
+- GtkWidget *widget);
+ static void preferences_widget_sync_string (const gchar *key,
+ GtkWidget *widget);
+ static void preferences_widget_sync_string_combo (const gchar *key,
+ GtkWidget *widget);
+-static void preferences_notify_int_cb (EmpathyConf *conf,
+- const gchar *key,
+- gpointer user_data);
+ static void preferences_notify_string_cb (EmpathyConf *conf,
+ const gchar *key,
+ gpointer user_data);
+@@ -103,12 +98,6 @@ static void preferences_notify_bool_cb (EmpathyConf
+ static void preferences_notify_sensitivity_cb (EmpathyConf *conf,
+ const gchar *key,
+ gpointer user_data);
+-static void preferences_hookup_spin_button (EmpathyPreferences *preferences,
+- const gchar *key,
+- GtkWidget *widget);
+-static void preferences_hookup_entry (EmpathyPreferences *preferences,
+- const gchar *key,
+- GtkWidget *widget);
+ static void preferences_hookup_toggle_button (EmpathyPreferences *preferences,
+ const gchar *key,
+ GtkWidget *widget);
+@@ -121,10 +110,6 @@ static void preferences_hookup_string_combo (EmpathyPreferences
+ static void preferences_hookup_sensitivity (EmpathyPreferences *preferences,
+ const gchar *key,
+ GtkWidget *widget);
+-static void preferences_spin_button_value_changed_cb (GtkWidget *button,
+- gpointer user_data);
+-static void preferences_entry_value_changed_cb (GtkWidget *entry,
+- gpointer user_data);
+ static void preferences_toggle_button_toggled_cb (GtkWidget *button,
+ gpointer user_data);
+ static void preferences_radio_button_toggled_cb (GtkWidget *button,
+@@ -488,18 +473,6 @@ preferences_widget_sync_bool (const gchar *key, GtkWidget *widget)
+ }
+
+ static void
+-preferences_widget_sync_int (const gchar *key, GtkWidget *widget)
+-{
+- gint value;
+-
+- if (empathy_conf_get_int (empathy_conf_get (), key, &value)) {
+- if (GTK_IS_SPIN_BUTTON (widget)) {
+- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+- }
+- }
+-}
+-
+-static void
+ preferences_widget_sync_string (const gchar *key, GtkWidget *widget)
+ {
+ gchar *value;
+@@ -580,14 +553,6 @@ preferences_widget_sync_string_combo (const gchar *key, GtkWidget *widget)
+ }
+
+ static void
+-preferences_notify_int_cb (EmpathyConf *conf,
+- const gchar *key,
+- gpointer user_data)
+-{
+- preferences_widget_sync_int (key, user_data);
+-}
+-
+-static void
+ preferences_notify_string_cb (EmpathyConf *conf,
+ const gchar *key,
+ gpointer user_data)
+@@ -631,67 +596,6 @@ preferences_add_id (EmpathyPreferences *preferences, guint id)
+ }
+
+ static void
+-preferences_hookup_spin_button (EmpathyPreferences *preferences,
+- const gchar *key,
+- GtkWidget *widget)
+-{
+- guint id;
+-
+- /* Silence warning. */
+- if (0) {
+- preferences_hookup_spin_button (preferences, key, widget);
+- }
+-
+- preferences_widget_sync_int (key, widget);
+-
+- g_object_set_data_full (G_OBJECT (widget), "key",
+- g_strdup (key), g_free);
+-
+- g_signal_connect (widget,
+- "value_changed",
+- G_CALLBACK (preferences_spin_button_value_changed_cb),
+- NULL);
+-
+- id = empathy_conf_notify_add (empathy_conf_get (),
+- key,
+- preferences_notify_int_cb,
+- widget);
+- if (id) {
+- preferences_add_id (preferences, id);
+- }
+-}
+-
+-static void
+-preferences_hookup_entry (EmpathyPreferences *preferences,
+- const gchar *key,
+- GtkWidget *widget)
+-{
+- guint id;
+-
+- if (0) { /* Silent warning before we use this function. */
+- preferences_hookup_entry (preferences, key, widget);
+- }
+-
+- preferences_widget_sync_string (key, widget);
+-
+- g_object_set_data_full (G_OBJECT (widget), "key",
+- g_strdup (key), g_free);
+-
+- g_signal_connect (widget,
+- "changed",
+- G_CALLBACK (preferences_entry_value_changed_cb),
+- NULL);
+-
+- id = empathy_conf_notify_add (empathy_conf_get (),
+- key,
+- preferences_notify_string_cb,
+- widget);
+- if (id) {
+- preferences_add_id (preferences, id);
+- }
+-}
+-
+-static void
+ preferences_hookup_toggle_button (EmpathyPreferences *preferences,
+ const gchar *key,
+ GtkWidget *widget)
+@@ -795,32 +699,6 @@ preferences_hookup_sensitivity (EmpathyPreferences *preferences,
+ }
+
+ static void
+-preferences_spin_button_value_changed_cb (GtkWidget *button,
+- gpointer user_data)
+-{
+- const gchar *key;
+-
+- key = g_object_get_data (G_OBJECT (button), "key");
+-
+- empathy_conf_set_int (empathy_conf_get (),
+- key,
+- gtk_spin_button_get_value (GTK_SPIN_BUTTON (button)));
+-}
+-
+-static void
+-preferences_entry_value_changed_cb (GtkWidget *entry,
+- gpointer user_data)
+-{
+- const gchar *key;
+-
+- key = g_object_get_data (G_OBJECT (entry), "key");
+-
+- empathy_conf_set_string (empathy_conf_get (),
+- key,
+- gtk_entry_get_text (GTK_ENTRY (entry)));
+-}
+-
+-static void
+ preferences_toggle_button_toggled_cb (GtkWidget *button,
+ gpointer user_data)
+ {
More information about the Pkg-telepathy-commits
mailing list