Attachment #150479 for bug #218687

View | Details | Raw Unified | Return to bug 218687
Collapse All | Expand All




++ empathy-0.22.0/libempathy-gtk/empathy-preferences.c

static void     preferences_themes_setup                 (EmpathyPreferences      *preferences);
static void     preferences_widget_sync_bool             (const gchar            *key,
							  GtkWidget              *widget);
#ifdef COMMENTED_OUT
static void     preferences_widget_sync_int              (const gchar            *key,
							  GtkWidget              *widget);
#endif /* COMMENTED_OUT */
static void     preferences_widget_sync_string           (const gchar            *key,
							  GtkWidget              *widget);
static void     preferences_widget_sync_string_combo     (const gchar            *key,
							  GtkWidget              *widget);
#ifdef COMMENTED_OUT
static void     preferences_notify_int_cb                (EmpathyConf             *conf,
							  const gchar            *key,
							  gpointer                user_data);
#endif /* COMMENTED_OUT */
static void     preferences_notify_string_cb             (EmpathyConf             *conf,
							  const gchar            *key,
							  gpointer                user_data);

static void     preferences_notify_sensitivity_cb        (EmpathyConf             *conf,
							  const gchar            *key,
							  gpointer                user_data);
#ifdef COMMENTED_OUT
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);
#endif /* COMMENTED_OUT */
static void     preferences_hookup_toggle_button         (EmpathyPreferences      *preferences,
							  const gchar            *key,
							  GtkWidget              *widget);

static void     preferences_hookup_sensitivity           (EmpathyPreferences      *preferences,
							  const gchar            *key,
							  GtkWidget              *widget);
#ifdef COMMENTED_OUT
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);
#endif /* COMMENTED_OUT */
static void     preferences_toggle_button_toggled_cb     (GtkWidget              *button,
							  gpointer                user_data);
static void     preferences_radio_button_toggled_cb      (GtkWidget              *button,

	}
}

#ifdef COMMENTED_OUT
static void
preferences_widget_sync_int (const gchar *key, GtkWidget *widget)
{

		}
	}
}
#endif /* COMMENTED_OUT */

static void
preferences_widget_sync_string (const gchar *key, GtkWidget *widget)

	g_free (value);
}

#ifdef COMMENTED_OUT
static void
preferences_notify_int_cb (EmpathyConf  *conf,
			   const gchar *key,

{
	preferences_widget_sync_int (key, user_data);	
}
#endif /* COMMENTED_OUT */

static void
preferences_notify_string_cb (EmpathyConf  *conf,

						  GUINT_TO_POINTER (id));
}

#ifdef COMMENTED_OUT
static void
preferences_hookup_spin_button (EmpathyPreferences *preferences,
				const gchar       *key,

		preferences_add_id (preferences, id);
	}
}
#endif /* COMMENTED_OUT */

static void
preferences_hookup_toggle_button (EmpathyPreferences *preferences,

	}
}

#ifdef COMMENTED_OUT
static void
preferences_spin_button_value_changed_cb (GtkWidget *button,
					  gpointer   user_data)

				 key,
				 gtk_entry_get_text (GTK_ENTRY (entry)));
}
#endif /* COMMENTED_OUT */

static void
preferences_toggle_button_toggled_cb (GtkWidget *button,

Return to bug 218687

Line Link Here

(-)file_not_specified_in_diff (-1 / +17 lines)
0	-- empathy-0.22.0.orig/libempathy-gtk/empathy-preferences.c	0	++ empathy-0.22.0/libempathy-gtk/empathy-preferences.c
Lines 82-96 Link Here
82	static void preferences_themes_setup (EmpathyPreferences *preferences);	82	static void preferences_themes_setup (EmpathyPreferences *preferences);
83	static void preferences_widget_sync_bool (const gchar *key,	83	static void preferences_widget_sync_bool (const gchar *key,
84	GtkWidget *widget);	84	GtkWidget *widget);
		85	#ifdef COMMENTED_OUT
85	static void preferences_widget_sync_int (const gchar *key,	86	static void preferences_widget_sync_int (const gchar *key,
86	GtkWidget *widget);	87	GtkWidget *widget);
		88	#endif /* COMMENTED_OUT */
87	static void preferences_widget_sync_string (const gchar *key,	89	static void preferences_widget_sync_string (const gchar *key,
88	GtkWidget *widget);	90	GtkWidget *widget);
89	static void preferences_widget_sync_string_combo (const gchar *key,	91	static void preferences_widget_sync_string_combo (const gchar *key,
90	GtkWidget *widget);	92	GtkWidget *widget);
		93	#ifdef COMMENTED_OUT
91	static void preferences_notify_int_cb (EmpathyConf *conf,	94	static void preferences_notify_int_cb (EmpathyConf *conf,
92	const gchar *key,	95	const gchar *key,
93	gpointer user_data);	96	gpointer user_data);
		97	#endif /* COMMENTED_OUT */
94	static void preferences_notify_string_cb (EmpathyConf *conf,	98	static void preferences_notify_string_cb (EmpathyConf *conf,
95	const gchar *key,	99	const gchar *key,
96	gpointer user_data);	100	gpointer user_data);
Lines 103-114 Link Here
103	static void preferences_notify_sensitivity_cb (EmpathyConf *conf,	107	static void preferences_notify_sensitivity_cb (EmpathyConf *conf,
104	const gchar *key,	108	const gchar *key,
105	gpointer user_data);	109	gpointer user_data);
		110	#ifdef COMMENTED_OUT
106	static void preferences_hookup_spin_button (EmpathyPreferences *preferences,	111	static void preferences_hookup_spin_button (EmpathyPreferences *preferences,
107	const gchar *key,	112	const gchar *key,
108	GtkWidget *widget);	113	GtkWidget *widget);
109	static void preferences_hookup_entry (EmpathyPreferences *preferences,	114	static void preferences_hookup_entry (EmpathyPreferences *preferences,
110	const gchar *key,	115	const gchar *key,
111	GtkWidget *widget);	116	GtkWidget *widget);
		117	#endif /* COMMENTED_OUT */
112	static void preferences_hookup_toggle_button (EmpathyPreferences *preferences,	118	static void preferences_hookup_toggle_button (EmpathyPreferences *preferences,
113	const gchar *key,	119	const gchar *key,
114	GtkWidget *widget);	120	GtkWidget *widget);
Lines 121-130 Link Here
121	static void preferences_hookup_sensitivity (EmpathyPreferences *preferences,	127	static void preferences_hookup_sensitivity (EmpathyPreferences *preferences,
122	const gchar *key,	128	const gchar *key,
123	GtkWidget *widget);	129	GtkWidget *widget);
		130	#ifdef COMMENTED_OUT
124	static void preferences_spin_button_value_changed_cb (GtkWidget *button,	131	static void preferences_spin_button_value_changed_cb (GtkWidget *button,
125	gpointer user_data);	132	gpointer user_data);
126	static void preferences_entry_value_changed_cb (GtkWidget *entry,	133	static void preferences_entry_value_changed_cb (GtkWidget *entry,
127	gpointer user_data);	134	gpointer user_data);
		135	#endif /* COMMENTED_OUT */
128	static void preferences_toggle_button_toggled_cb (GtkWidget *button,	136	static void preferences_toggle_button_toggled_cb (GtkWidget *button,
129	gpointer user_data);	137	gpointer user_data);
130	static void preferences_radio_button_toggled_cb (GtkWidget *button,	138	static void preferences_radio_button_toggled_cb (GtkWidget *button,
Lines 487-492 Link Here
487	}	495	}
488	}	496	}
489		497
		498	#ifdef COMMENTED_OUT
490	static void	499	static void
491	preferences_widget_sync_int (const gchar key, GtkWidget widget)	500	preferences_widget_sync_int (const gchar key, GtkWidget widget)
492	{	501	{
Lines 498-503 Link Here
498	}	507	}
499	}	508	}
500	}	509	}
		510	#endif /* COMMENTED_OUT */
501		511
502	static void	512	static void
503	preferences_widget_sync_string (const gchar key, GtkWidget widget)	513	preferences_widget_sync_string (const gchar key, GtkWidget widget)
Lines 579-584 Link Here
579	g_free (value);	589	g_free (value);
580	}	590	}
581		591
		592	#ifdef COMMENTED_OUT
582	static void	593	static void
583	preferences_notify_int_cb (EmpathyConf *conf,	594	preferences_notify_int_cb (EmpathyConf *conf,
584	const gchar *key,	595	const gchar *key,
Lines 586-591 Link Here
586	{	597	{
587	preferences_widget_sync_int (key, user_data);	598	preferences_widget_sync_int (key, user_data);
588	}	599	}
		600	#endif /* COMMENTED_OUT */
589		601
590	static void	602	static void
591	preferences_notify_string_cb (EmpathyConf *conf,	603	preferences_notify_string_cb (EmpathyConf *conf,
Lines 630-635 Link Here
630	GUINT_TO_POINTER (id));	642	GUINT_TO_POINTER (id));
631	}	643	}
632		644
		645	#ifdef COMMENTED_OUT
633	static void	646	static void
634	preferences_hookup_spin_button (EmpathyPreferences *preferences,	647	preferences_hookup_spin_button (EmpathyPreferences *preferences,
635	const gchar *key,	648	const gchar *key,
Lines 690-695 Link Here
690	preferences_add_id (preferences, id);	703	preferences_add_id (preferences, id);
691	}	704	}
692	}	705	}
		706	#endif /* COMMENTED_OUT */
693		707
694	static void	708	static void
695	preferences_hookup_toggle_button (EmpathyPreferences *preferences,	709	preferences_hookup_toggle_button (EmpathyPreferences *preferences,
Lines 794-799 Link Here
794	}	808	}
795	}	809	}
796		810
		811	#ifdef COMMENTED_OUT
797	static void	812	static void
798	preferences_spin_button_value_changed_cb (GtkWidget *button,	813	preferences_spin_button_value_changed_cb (GtkWidget *button,
799	gpointer user_data)	814	gpointer user_data)
Lines 819-824 Link Here
819	key,	834	key,
820	gtk_entry_get_text (GTK_ENTRY (entry)));	835	gtk_entry_get_text (GTK_ENTRY (entry)));
821	}	836	}
		837	#endif /* COMMENTED_OUT */
822		838
823	static void	839	static void
824	preferences_toggle_button_toggled_cb (GtkWidget *button,	840	preferences_toggle_button_toggled_cb (GtkWidget *button,