← Back to branch summary

~ubuntu-branches/ubuntu/quantal/file-roller/quantal

« back to all changes in this revision

Viewing changes to .pc/11_search_as_you_type.patch/src/fr-window.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-06-06 13:13:15 UTC
  • mfrom: (1.2.102)
  • Revision ID: package-import@ubuntu.com-20120606131315-v6o9g8e0cq9olkq1
Tags: 3.5.1-0ubuntu1
* New upstream release
* debian/control:
  - Bump build-depends on libgtk-3-dev
  - Replace build-depends on gnome-doc-utils with yelp-tools
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/11_search_as_you_type.patch/src/fr-window.c
239
239
        LAST_SIGNAL
240
240
};
241
241
 
242
 
static GtkWindowClass *parent_class = NULL;
 
242
static GtkApplicationWindowClass *parent_class = NULL;
243
243
static guint fr_window_signals[LAST_SIGNAL] = { 0 };
244
244
 
245
245
struct _FrWindowPrivateData {
647
647
                window->priv = NULL;
648
648
        }
649
649
 
650
 
        WindowList = g_list_remove (WindowList, window);
651
 
 
652
 
        G_OBJECT_CLASS (parent_class)->finalize (object);
653
 
 
654
 
        if (WindowList == NULL) {
 
650
        if (gtk_application_get_windows (GTK_APPLICATION (g_application_get_default ())) == NULL) {
655
651
                if (pixbuf_hash != NULL) {
656
652
                        g_hash_table_foreach (pixbuf_hash,
657
653
                                              gh_unref_pixbuf,
666
662
                        g_hash_table_destroy (tree_pixbuf_hash);
667
663
                        tree_pixbuf_hash = NULL;
668
664
                }
669
 
 
670
 
                gtk_main_quit ();
671
665
        }
 
666
 
 
667
        G_OBJECT_CLASS (parent_class)->finalize (object);
672
668
}
673
669
 
674
670
 
808
804
                          "unrealize",
809
805
                          G_CALLBACK (fr_window_unrealized),
810
806
                          NULL);
811
 
 
812
 
        WindowList = g_list_prepend (WindowList, window);
813
807
}
814
808
 
815
809
 
831
825
                        (GInstanceInitFunc) fr_window_init
832
826
                };
833
827
 
834
 
                type = g_type_register_static (GTK_TYPE_WINDOW,
 
828
                type = g_type_register_static (GTK_TYPE_APPLICATION_WINDOW,
835
829
                                               "FrWindow",
836
830
                                               &type_info,
837
831
                                               0);
5876
5870
                                 g_cclosure_new_swap (G_CALLBACK (fr_window_close), window, NULL));
5877
5871
 
5878
5872
 
5879
 
        if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) {
 
5873
        if (! gtk_ui_manager_add_ui_from_resource (ui, "/org/gnome/FileRoller/ui/menus-toolbars.ui", &error)) {
5880
5874
                g_message ("building menus failed: %s", error->message);
5881
5875
                g_error_free (error);
5882
5876
        }
6057
6051
{
6058
6052
        GtkWidget *window;
6059
6053
 
6060
 
        window = g_object_new (FR_TYPE_WINDOW, NULL);
 
6054
        window = g_object_new (FR_TYPE_WINDOW, "application", g_application_get_default (), NULL);
6061
6055
        fr_window_construct ((FrWindow*) window);
6062
6056
 
6063
6057
        return window;