← Back to branch summary

~attente/unity-gtk-module/blacklist-anjuta

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: William Hua
  • Date: 2014-03-20 03:03:05 UTC
  • mto: (320.1.2 1208019)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: william.hua@canonical.com-20140320030305-afhkyu4m7htxrfdz
Stop using signal handler ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
70
70
struct _MenuShellData
71
71
{
72
72
  GtkWindow *window;
73
 
  gulong     settings_notify_gtk_shell_shows_menubar_handler_id;
74
73
};
75
74
 
76
75
static void (* pre_hijacked_window_realize)                          (GtkWidget      *widget);
603
602
 
604
603
  settings = gtk_widget_get_settings (widget);
605
604
  menu_shell_data = gtk_menu_shell_get_menu_shell_data (GTK_MENU_SHELL (widget));
606
 
  menu_shell_data->settings_notify_gtk_shell_shows_menubar_handler_id = g_signal_connect (settings, "notify::gtk-shell-shows-menubar", G_CALLBACK (gtk_settings_handle_gtk_shell_shows_menubar), widget);
 
605
  g_signal_connect (settings, "notify::gtk-shell-shows-menubar", G_CALLBACK (gtk_settings_handle_gtk_shell_shows_menubar), widget);
607
606
}
608
607
 
609
608
static void
610
609
hijacked_menu_bar_unrealize (GtkWidget *widget)
611
610
{
 
611
  GtkSettings *settings;
612
612
  MenuShellData *menu_shell_data;
613
613
 
614
614
  g_return_if_fail (GTK_IS_MENU_BAR (widget));
615
615
 
 
616
  settings = gtk_widget_get_settings (widget);
616
617
  menu_shell_data = gtk_menu_shell_get_menu_shell_data (GTK_MENU_SHELL (widget));
617
618
 
618
 
  if (menu_shell_data->settings_notify_gtk_shell_shows_menubar_handler_id)
619
 
    {
620
 
      g_signal_handler_disconnect (gtk_widget_get_settings (widget), menu_shell_data->settings_notify_gtk_shell_shows_menubar_handler_id);
621
 
      menu_shell_data->settings_notify_gtk_shell_shows_menubar_handler_id = 0;
622
 
    }
 
619
  if (settings != NULL)
 
620
    g_signal_handlers_disconnect_by_data (settings, widget);
623
621
 
624
622
  if (menu_shell_data->window != NULL)
625
623
    gtk_window_disconnect_menu_shell (menu_shell_data->window, GTK_MENU_SHELL (widget));