Attachment #124687 for bug #184869




++ src/streamtuner/st-network-preferences-page.c

  st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check),
			      &st_settings.proxy_enabled);
  st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->http_radio),
				&st_settings.proxy_type,
				ST_TRANSFER_PROXY_HTTP);
  st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->socks5_radio),
				&st_settings.proxy_type,
				ST_TRANSFER_PROXY_SOCKS5);
  st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry),
			     &st_settings.proxy_server);
++ src/streamtuner/st-preferences.c

}

void
st_preferences_bind_int_radio (GtkRadioButton *radio, void *ptr, int value)
{
  g_return_if_fail(GTK_IS_RADIO_BUTTON(radio));
  g_return_if_fail(ptr != NULL);

  g_object_set_data(G_OBJECT(radio), "value", GINT_TO_POINTER(value));
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *(int *)ptr);
  g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr);
}

++ src/streamtuner/st-preferences.h

void st_preferences_bind_int_spin	(GtkSpinButton		*spin,
					 int			*ptr);
void st_preferences_bind_int_radio	(GtkRadioButton		*radio,
					 void			*ptr,
					 int			value);

#endif /* _ST_PREFERENCES_H */
++ src/streamtuner/st-shell.c

static void
st_shell_make_window (STShell *shell)
{
  union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->window };

  shell->priv->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
  g_object_add_weak_pointer(G_OBJECT(shell->priv->window), pun.gpp);

  shell->priv->accel_group = gtk_accel_group_new();
  gtk_window_add_accel_group(GTK_WINDOW(shell->priv->window), shell->priv->accel_group);

    gtk_window_present(GTK_WINDOW(shell->priv->find));
  else
    {
      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->find };

      shell->priv->find = sgtk_find_dialog_new(GTK_WINDOW(shell->priv->window));
      g_object_add_weak_pointer(G_OBJECT(shell->priv->find), pun.gpp);

      sgtk_find_dialog_set_token(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_token ? st_settings.find_token : "");
      sgtk_find_dialog_set_history(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_history);

    gtk_window_present(GTK_WINDOW(shell->priv->stream_properties));
  else
    {
      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_properties };
      shell->priv->stream_properties = st_stream_properties_dialog_new(GTK_WINDOW(shell->priv->window));
      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), pun.gpp);

      g_signal_connect(shell->priv->stream_properties,
		       "response",

  else
    {
      STBrowserTab *selected_tab;
      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_columns };

      shell->priv->stream_columns = st_stream_columns_dialog_new(GTK_WINDOW(shell->priv->window));
      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), pun.gpp);

      selected_tab = st_shell_get_selected_tab(shell);
      if (selected_tab)

    gtk_window_present(GTK_WINDOW(shell->priv->about));
  else
    {
     union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->about };

      shell->priv->about = st_about_dialog_new(GTK_WINDOW(shell->priv->window));
      g_object_add_weak_pointer(G_OBJECT(shell->priv->about), pun.gpp);

      g_signal_connect(shell->priv->about,
		       "response",


  if (! shell->priv->preferences)
    {
      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->preferences };

      shell->priv->preferences = st_preferences_dialog_new(GTK_WINDOW(shell->priv->window));
      g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), pun.gpp);
    }

  if (handler)

Return to bug 184869

Line Link Here

(-)file_not_specified_in_diff (-15 / +25 lines)
0	-- src/streamtuner/st-network-preferences-page.c	0	++ src/streamtuner/st-network-preferences-page.c
Lines 183-192 Link Here
183	st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check),	183	st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check),
184	&st_settings.proxy_enabled);	184	&st_settings.proxy_enabled);
185	st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->http_radio),	185	st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->http_radio),
186	(int *) &st_settings.proxy_type,	186	&st_settings.proxy_type,
187	ST_TRANSFER_PROXY_HTTP);	187	ST_TRANSFER_PROXY_HTTP);
188	st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->socks5_radio),	188	st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->socks5_radio),
189	(int *) &st_settings.proxy_type,	189	&st_settings.proxy_type,
190	ST_TRANSFER_PROXY_SOCKS5);	190	ST_TRANSFER_PROXY_SOCKS5);
191	st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry),	191	st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry),
192	&st_settings.proxy_server);	192	&st_settings.proxy_server);
193	-- src/streamtuner/st-preferences.c	193	++ src/streamtuner/st-preferences.c
Lines 140-152 Link Here
140	}	140	}
141		141
142	void	142	void
143	st_preferences_bind_int_radio (GtkRadioButton radio, int ptr, int value)	143	st_preferences_bind_int_radio (GtkRadioButton radio, void ptr, int value)
144	{	144	{
145	g_return_if_fail(GTK_IS_RADIO_BUTTON(radio));	145	g_return_if_fail(GTK_IS_RADIO_BUTTON(radio));
146	g_return_if_fail(ptr != NULL);	146	g_return_if_fail(ptr != NULL);
147		147
148	g_object_set_data(G_OBJECT(radio), "value", GINT_TO_POINTER(value));	148	g_object_set_data(G_OBJECT(radio), "value", GINT_TO_POINTER(value));
149	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *ptr);	149	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == (int )ptr);
150	g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr);	150	g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr);
151	}	151	}
152		152
153	-- src/streamtuner/st-preferences.h	153	++ src/streamtuner/st-preferences.h
Lines 42-48 Link Here
42	void st_preferences_bind_int_spin (GtkSpinButton *spin,	42	void st_preferences_bind_int_spin (GtkSpinButton *spin,
43	int *ptr);	43	int *ptr);
44	void st_preferences_bind_int_radio (GtkRadioButton *radio,	44	void st_preferences_bind_int_radio (GtkRadioButton *radio,
45	int *ptr,	45	void *ptr,
46	int value);	46	int value);
47		47
48	#endif /* _ST_PREFERENCES_H */	48	#endif /* _ST_PREFERENCES_H */
49	-- src/streamtuner/st-shell.c	49	++ src/streamtuner/st-shell.c
Lines 465-472 Link Here
465	static void	465	static void
466	st_shell_make_window (STShell *shell)	466	st_shell_make_window (STShell *shell)
467	{	467	{
		468	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->window };
		469
468	shell->priv->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);	470	shell->priv->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
469	g_object_add_weak_pointer(G_OBJECT(shell->priv->window), (gpointer *) &shell->priv->window);	471	g_object_add_weak_pointer(G_OBJECT(shell->priv->window), pun.gpp);
470		472
471	shell->priv->accel_group = gtk_accel_group_new();	473	shell->priv->accel_group = gtk_accel_group_new();
472	gtk_window_add_accel_group(GTK_WINDOW(shell->priv->window), shell->priv->accel_group);	474	gtk_window_add_accel_group(GTK_WINDOW(shell->priv->window), shell->priv->accel_group);
Lines 1786-1793 Link Here
1786	gtk_window_present(GTK_WINDOW(shell->priv->find));	1788	gtk_window_present(GTK_WINDOW(shell->priv->find));
1787	else	1789	else
1788	{	1790	{
		1791	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->find };
		1792
1789	shell->priv->find = sgtk_find_dialog_new(GTK_WINDOW(shell->priv->window));	1793	shell->priv->find = sgtk_find_dialog_new(GTK_WINDOW(shell->priv->window));
1790	g_object_add_weak_pointer(G_OBJECT(shell->priv->find), (gpointer *) &shell->priv->find);	1794	g_object_add_weak_pointer(G_OBJECT(shell->priv->find), pun.gpp);
1791		1795
1792	sgtk_find_dialog_set_token(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_token ? st_settings.find_token : "");	1796	sgtk_find_dialog_set_token(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_token ? st_settings.find_token : "");
1793	sgtk_find_dialog_set_history(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_history);	1797	sgtk_find_dialog_set_history(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_history);
Lines 2101-2108 Link Here
2101	gtk_window_present(GTK_WINDOW(shell->priv->stream_properties));	2105	gtk_window_present(GTK_WINDOW(shell->priv->stream_properties));
2102	else	2106	else
2103	{	2107	{
		2108	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->stream_properties };
2104	shell->priv->stream_properties = st_stream_properties_dialog_new(GTK_WINDOW(shell->priv->window));	2109	shell->priv->stream_properties = st_stream_properties_dialog_new(GTK_WINDOW(shell->priv->window));
2105	g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), (gpointer *) &shell->priv->stream_properties);	2110	g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), pun.gpp);
2106		2111
2107	g_signal_connect(shell->priv->stream_properties,	2112	g_signal_connect(shell->priv->stream_properties,
2108	"response",	2113	"response",
Lines 2161-2169 Link Here
2161	else	2166	else
2162	{	2167	{
2163	STBrowserTab *selected_tab;	2168	STBrowserTab *selected_tab;
		2169	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->stream_columns };
2164		2170
2165	shell->priv->stream_columns = st_stream_columns_dialog_new(GTK_WINDOW(shell->priv->window));	2171	shell->priv->stream_columns = st_stream_columns_dialog_new(GTK_WINDOW(shell->priv->window));
2166	g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), (gpointer *) &shell->priv->stream_columns);	2172	g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), pun.gpp);
2167		2173
2168	selected_tab = st_shell_get_selected_tab(shell);	2174	selected_tab = st_shell_get_selected_tab(shell);
2169	if (selected_tab)	2175	if (selected_tab)
Lines 2195-2202 Link Here
2195	gtk_window_present(GTK_WINDOW(shell->priv->about));	2201	gtk_window_present(GTK_WINDOW(shell->priv->about));
2196	else	2202	else
2197	{	2203	{
		2204	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->about };
		2205
2198	shell->priv->about = st_about_dialog_new(GTK_WINDOW(shell->priv->window));	2206	shell->priv->about = st_about_dialog_new(GTK_WINDOW(shell->priv->window));
2199	g_object_add_weak_pointer(G_OBJECT(shell->priv->about), (gpointer *) &shell->priv->about);	2207	g_object_add_weak_pointer(G_OBJECT(shell->priv->about), pun.gpp);
2200		2208
2201	g_signal_connect(shell->priv->about,	2209	g_signal_connect(shell->priv->about,
2202	"response",	2210	"response",
Lines 2244-2251 Link Here
2244		2252
2245	if (! shell->priv->preferences)	2253	if (! shell->priv->preferences)
2246	{	2254	{
		2255	union { GtkWidget *wpp; gpointer gpp; }pun = { &shell->priv->preferences };
		2256
2247	shell->priv->preferences = st_preferences_dialog_new(GTK_WINDOW(shell->priv->window));	2257	shell->priv->preferences = st_preferences_dialog_new(GTK_WINDOW(shell->priv->window));
2248	g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), (gpointer *) &shell->priv->preferences);	2258	g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), pun.gpp);
2249	}	2259	}
2250		2260
2251	if (handler)	2261	if (handler)