← Back to branch summary

~cairo-dock-team/ubuntu/natty/cairo-dock/2.3.0-1

« back to all changes in this revision

Viewing changes to src/cairo-dock-menu.c

  • Committer: matttbe
  • Date: 2010-10-02 18:11:29 UTC
  • Revision ID: matttbe@gmail.com-20101002181129-eeetybt3keeqdf9x
https://launchpad.net/bugs/518628
https://launchpad.net/bugs/611738
https://launchpad.net/bugs/653702
* New Upstream Version (LP: #653702)
* Fixed a few bugs:
 - Fixed a random crash if CD is launched much time before the WM
 - Improved the OpenGL backend.
 - Some Images paths were wrong
 - Icon label text was truncated (LP: #611738)
 - Fixed a bug when the font was too big
 - Gauges: Add a line return in order to read all Readme file
 - Dialogues don't respect selected font (LP: #518628)
* debian/control:
 - Updated the description.
* data/help.conf.in:
 - Removed the Gnome-Panel: Used the right gconf key

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-dock-menu.c
116
116
        cd_message ("%s (%s)", __func__, cDockName);
117
117
        
118
118
        gchar *cConfFilePath = g_strdup_printf ("%s/%s.conf", g_cCurrentThemePath, cDockName);
119
 
        if (! g_file_test (cConfFilePath, G_FILE_TEST_EXISTS))
 
119
        if (! g_file_test (cConfFilePath, G_FILE_TEST_EXISTS))  // ne devrait pas arriver mais au cas ou.
120
120
        {
121
 
                gchar *cCommand = g_strdup_printf ("cp \"%s\" \"%s\"", CAIRO_DOCK_SHARE_DATA_DIR"/"CAIRO_DOCK_MAIN_DOCK_CONF_FILE, cConfFilePath);
 
121
                cairo_dock_add_root_dock_config_for_name (cDockName);
 
122
                /**gchar *cCommand = g_strdup_printf ("cp \"%s\" \"%s\"", CAIRO_DOCK_SHARE_DATA_DIR"/"CAIRO_DOCK_MAIN_DOCK_CONF_FILE, cConfFilePath);
122
123
                int r = system (cCommand);
123
 
                g_free (cCommand);
 
124
                g_free (cCommand);*/
124
125
        }
125
126
        
126
127
        if (s_pRootDockConfigWindow != NULL)